From f36c9565362b741c58672204fe0c155252affe28 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Tue, 24 Jan 2023 13:00:11 -0600 Subject: Resolve all remaining lint issues (#88) * Rework 'navIdx' variables from number arrays to strings to avoid equality-check failures in react hooks * Resolve all remaining lint issues * Fix tests * Use node v18 in gh action test --- src/view/shell/mobile/index.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/view/shell/mobile/index.tsx') diff --git a/src/view/shell/mobile/index.tsx b/src/view/shell/mobile/index.tsx index fb14211eb..62ab7a2ad 100644 --- a/src/view/shell/mobile/index.tsx +++ b/src/view/shell/mobile/index.tsx @@ -32,7 +32,7 @@ import {Text} from '../../com/util/text/Text' import {ErrorBoundary} from '../../com/util/ErrorBoundary' import {TabsSelector} from './TabsSelector' import {Composer} from './Composer' -import {colors} from '../../lib/styles' +import {s, colors} from '../../lib/styles' import {clamp} from '../../../lib/numbers' import { GridIcon, @@ -385,7 +385,7 @@ export const MobileShell: React.FC = observer(() => { /> { */ type ScreenRenderDesc = MatchResult & { key: string - navIdx: [number, number] + navIdx: string current: boolean previous: boolean isNewTab: boolean @@ -514,7 +514,7 @@ function constructScreenRenderDesc(nav: NavigationModel): { hasNewTab = hasNewTab || tab.isNewTab return Object.assign(matchRes, { key: `t${tab.id}-s${screen.index}`, - navIdx: [tab.id, screen.id], + navIdx: `${tab.id}-${screen.id}`, current: isCurrent, previous: isPrevious, isNewTab: tab.isNewTab, -- cgit 1.4.1