Skip to content

Commit e7bbf0a

Browse files
committed
Fix linting errors
1 parent 9124de2 commit e7bbf0a

File tree

7 files changed

+18
-365
lines changed

7 files changed

+18
-365
lines changed

.eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module.exports = {
3636
rules: {
3737
quotes: ['warn', 'single', { allowTemplateLiterals: true }],
3838
'no-console': 'warn',
39-
'no-unused-vars': 'warn',
39+
'no-unused-vars': 'off',
4040
'no-prototype-builtins': 'off',
4141
'sort-imports': [
4242
'error',
@@ -65,7 +65,7 @@ module.exports = {
6565
groups: ['builtin', 'external', 'parent', 'index', 'sibling'],
6666
},
6767
],
68-
'@typescript-eslint/no-unused-vars': 'error',
68+
'@typescript-eslint/no-unused-vars': 'warn',
6969
'@typescript-eslint/explicit-member-accessibility': 'error',
7070
'prettier/prettier': 'off',
7171
},

packages/chonky/src/components/file-list/FileList.tsx

+6-11
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ import React, { useCallback } from 'react';
22
import { useSelector } from 'react-redux';
33
import AutoSizer from 'react-virtualized-auto-sizer';
44

5-
import {
6-
selectDisplayFileIds,
7-
selectFileViewConfig,
8-
selectIsGridView,
9-
} from '../../redux/selectors';
10-
import { FileViewConfig } from '../../types/file-view.types';
5+
import { selectDisplayFileIds, selectFileViewConfig } from '../../redux/selectors';
6+
import { FileViewConfig, FileViewMode } from '../../types/file-view.types';
117
import { c, makeGlobalChonkyStyles, makeLocalChonkyStyles } from '../../util/styles';
128
import { FileListEmpty } from './FileListEmpty';
139
import { GridContainer } from './GridContainer';
@@ -18,7 +14,6 @@ export interface FileListProps {}
1814
export const FileList: React.FC<FileListProps> = React.memo(() => {
1915
const displayFileIds = useSelector(selectDisplayFileIds);
2016
const viewConfig = useSelector(selectFileViewConfig);
21-
const isGridView = useSelector(selectIsGridView);
2217

2318
const localClasses = useLocalStyles(viewConfig);
2419
const classes = useStyles(viewConfig);
@@ -32,13 +27,13 @@ export const FileList: React.FC<FileListProps> = React.memo(() => {
3227
({ width, height }: { width: number; height: number }) => {
3328
if (displayFileIds.length === 0) {
3429
return <FileListEmpty width={width} height={viewConfig.entryHeight} />;
35-
} else if (isGridView) {
36-
return <GridContainer width={width} height={height} />;
37-
} else {
30+
} else if (viewConfig.mode === FileViewMode.List) {
3831
return <ListContainer width={width} height={height} />;
32+
} else {
33+
return <GridContainer width={width} height={height} />;
3934
}
4035
},
41-
[displayFileIds, viewConfig, isGridView]
36+
[displayFileIds, viewConfig]
4237
);
4338

4439
return (

packages/chonky/src/components/file-list/GridContainer.tsx

+8-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { selectDisplayFileIds, selectFileViewConfig } from '../../redux/selector
1919
import { FileViewConfigGrid } from '../../types/file-view.types';
2020
import { useInstanceVariable } from '../../util/hooks-helpers';
2121
import { useIsMobileBreakpoint } from '../../util/styles';
22-
import { isMobileDevice } from '../../util/validation';
2322
import { SmartFileEntry } from './FileEntry';
2423

2524
export interface FileListGridProps {
@@ -35,6 +34,14 @@ interface GridConfig {
3534
columnWidth: number;
3635
}
3736

37+
export const isMobileDevice = () => {
38+
// noinspection JSDeprecatedSymbols
39+
return (
40+
typeof window.orientation !== 'undefined' ||
41+
navigator.userAgent.indexOf('IEMobile') !== -1
42+
);
43+
};
44+
3845
export const getGridConfig = (
3946
width: number,
4047
fileCount: number,

packages/chonky/src/components/file-list/GridEntry.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import {
99
} from './FileEntry-hooks';
1010
import { FileEntryName } from './FileEntryName';
1111
import {
12+
FileEntryState,
1213
GridEntryPreviewFile,
1314
GridEntryPreviewFolder,
14-
FileEntryState,
1515
} from './GridEntryPreview';
1616

1717
export const GridEntry: React.FC<FileEntryProps> = React.memo(

packages/chonky/src/components/file-list/GridEntryDndIndicator.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
import React from 'react';
8-
import { DndEntryState } from '../../types/file-list.types';
98

9+
import { DndEntryState } from '../../types/file-list.types';
1010
import { c, makeLocalChonkyStyles } from '../../util/styles';
1111
import { ChonkyIconFA } from '../external/ChonkyIcon';
1212
import { useDndIcon } from './FileEntry-hooks';

packages/chonky/src/redux/selectors.ts

-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ export const selectSelectedFilesForActionCount = (fileActionId: string) => (
6666
) => getSelectedFilesForAction(state, fileActionId)?.length;
6767

6868
export const selectFileViewConfig = (state: RootState) => state.fileViewConfig;
69-
export const selectIsGridView = (state: RootState) =>
70-
!!selectFileViewConfig(state).entryWidth;
7169

7270
export const selectSortActionId = (state: RootState) => state.sortActionId;
7371
export const selectSortOrder = (state: RootState) => state.sortOrder;

0 commit comments

Comments
 (0)