diff --git a/desktop/.eslintrc.js b/desktop/.eslintrc.js index 5fd132590..e60c0f213 100644 --- a/desktop/.eslintrc.js +++ b/desktop/.eslintrc.js @@ -104,7 +104,7 @@ module.exports = { 'flipper/no-relative-imports-across-packages': [2], 'flipper/no-electron-remote-imports': [1], 'flipper/no-console-error-without-context': [1], - 'communist-spelling/communist-spelling': [1], + 'communist-spelling/communist-spelling': [1, {allow: ['cancelled']}], // promise rules, see https://github.com/xjamundx/eslint-plugin-promise for details on each of them 'promise/catch-or-return': 'warn', diff --git a/desktop/app/src/ui/components/TooltipProvider.tsx b/desktop/app/src/ui/components/TooltipProvider.tsx index 44a423638..bbb658e82 100644 --- a/desktop/app/src/ui/components/TooltipProvider.tsx +++ b/desktop/app/src/ui/components/TooltipProvider.tsx @@ -14,7 +14,7 @@ import {Property} from 'csstype'; import React from 'react'; const defaultOptions = { - backgroundColor: colors.blueGrey, + backgroundColor: colors.blueGray, position: 'below', color: colors.white, showTail: true, diff --git a/desktop/app/src/ui/components/colors.tsx b/desktop/app/src/ui/components/colors.tsx index 65e2c3106..a3a1191a3 100644 --- a/desktop/app/src/ui/components/colors.tsx +++ b/desktop/app/src/ui/components/colors.tsx @@ -87,15 +87,15 @@ export const colors = { dark90: '#191919', // Dark 90 – Nav Bar, Tab Bar, Cards - Nav bar, tab bar, cards dark95: '#0d0d0d', // Dark 95 – Background Wash - Background Wash // FIG Spectrum - blueGrey: '#5f6673', // Blue Grey - blueGreyDark3: '#23272f', // Blue Grey - Dark 3 - blueGreyDark2: '#303846', // Blue Grey - Dark 2 - blueGreyDark1: '#4f5766', // Blue Grey - Dark 1 - blueGreyTint15: '#777d88', // Blue Grey - Tint 15 - blueGreyTint30: '#8f949d', // Blue Grey - Tint 30 - blueGreyTint50: '#afb3b9', // Blue Grey - Tint 50 - blueGreyTint70: '#cfd1d5', // Blue Grey - Tint 70 - blueGreyTint90: '#eff0f1', // Blue Grey - Tint 90 + blueGray: '#5f6673', // Blue Grey + blueGrayDark3: '#23272f', // Blue Grey - Dark 3 + blueGrayDark2: '#303846', // Blue Grey - Dark 2 + blueGrayDark1: '#4f5766', // Blue Grey - Dark 1 + blueGrayTint15: '#777d88', // Blue Grey - Tint 15 + blueGrayTint30: '#8f949d', // Blue Grey - Tint 30 + blueGrayTint50: '#afb3b9', // Blue Grey - Tint 50 + blueGrayTint70: '#cfd1d5', // Blue Grey - Tint 70 + blueGrayTint90: '#eff0f1', // Blue Grey - Tint 90 slate: '#b9cad2', // Slate slateDark3: '#688694', // Slate - Dark 3 slateDark2: '#89a1ac', // Slate - Dark 2 diff --git a/desktop/flipper-plugin/src/test-utils/test-utils.tsx b/desktop/flipper-plugin/src/test-utils/test-utils.tsx index 83964b13e..93b8791e6 100644 --- a/desktop/flipper-plugin/src/test-utils/test-utils.tsx +++ b/desktop/flipper-plugin/src/test-utils/test-utils.tsx @@ -389,6 +389,7 @@ function createBasePluginResult( deactivate: () => pluginInstance.deactivate(), exportStateAsync: () => pluginInstance.exportState(createStubIdler(), () => {}), + // eslint-disable-next-line node/no-sync exportState: () => pluginInstance.exportStateSync(), triggerDeepLink: async (deepLink: unknown) => { pluginInstance.triggerDeepLink(deepLink); diff --git a/desktop/flipper-plugin/src/ui/Tracked.tsx b/desktop/flipper-plugin/src/ui/Tracked.tsx index b1cf87b34..3347a7a54 100644 --- a/desktop/flipper-plugin/src/ui/Tracked.tsx +++ b/desktop/flipper-plugin/src/ui/Tracked.tsx @@ -172,6 +172,7 @@ export function wrapInteractionHandler( const initialEnd = Date.now(); if (typeof res?.then === 'function' && typeof res?.catch === 'function') { // async / promise + // eslint-disable-next-line promise/catch-or-return res.then( () => r(initialEnd), (error: any) => r(initialEnd, error), diff --git a/desktop/flipper-plugin/src/ui/__tests__/Tracked.node.tsx b/desktop/flipper-plugin/src/ui/__tests__/Tracked.node.tsx index 663ff9065..208bfcf10 100644 --- a/desktop/flipper-plugin/src/ui/__tests__/Tracked.node.tsx +++ b/desktop/flipper-plugin/src/ui/__tests__/Tracked.node.tsx @@ -7,6 +7,8 @@ * @format */ +/* eslint-disable promise/catch-or-return */ + import {render, fireEvent} from '@testing-library/react'; import {TestUtils} from '../../'; import {sleep} from '../../utils/sleep'; diff --git a/desktop/flipper-plugin/src/ui/data-inspector/DataDescription.tsx b/desktop/flipper-plugin/src/ui/data-inspector/DataDescription.tsx index a9aed4adb..d74af6170 100644 --- a/desktop/flipper-plugin/src/ui/data-inspector/DataDescription.tsx +++ b/desktop/flipper-plugin/src/ui/data-inspector/DataDescription.tsx @@ -27,7 +27,7 @@ export const presetColors = Object.values({ blue: '#4267b2', // Blue - Active-state nav glyphs, nav bars, links, buttons green: '#42b72a', // Green - Confirmation, success, commerce and status red: '#FC3A4B', // Red - Badges, error states - blueGrey: '#5f6673', // Blue Grey + blueGray: '#5f6673', // Blue Grey slate: '#b9cad2', // Slate aluminum: '#a3cedf', // Aluminum seaFoam: '#54c7ec', // Sea Foam diff --git a/desktop/plugins/public/navigation/components/NavigationInfoBox.tsx b/desktop/plugins/public/navigation/components/NavigationInfoBox.tsx index 6639f1a5f..d21d72abb 100644 --- a/desktop/plugins/public/navigation/components/NavigationInfoBox.tsx +++ b/desktop/plugins/public/navigation/components/NavigationInfoBox.tsx @@ -37,7 +37,7 @@ const ScreenshotContainer = styled.div({ width: 200, minWidth: 200, overflow: 'hidden', - borderLeft: `1px ${colors.blueGreyTint90} solid`, + borderLeft: `1px ${colors.blueGrayTint90} solid`, position: 'relative', height: '100%', borderRadius: 10, @@ -61,7 +61,7 @@ const NavigationDataContainer = styled.div({ const Footer = styled.div({ width: '100%', padding: '10px', - borderTop: `1px ${colors.blueGreyTint90} solid`, + borderTop: `1px ${colors.blueGrayTint90} solid`, display: 'flex', alignItems: 'center', }); @@ -92,7 +92,7 @@ const Header = styled.div({ userSelect: 'text', cursor: 'text', padding: 10, - borderBottom: `1px ${colors.blueGreyTint90} solid`, + borderBottom: `1px ${colors.blueGrayTint90} solid`, display: 'flex', });