diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-11-12 03:59:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-12 08:29:35 +0530 |
commit | 53937fd58023ef800bd8ca1cd2b6d2d7bc891834 (patch) | |
tree | ea70778761addfaba1732dcb515dabd9f37f09ea /src/features | |
parent | Use forked version of 'node-mac-permissions' till the PR gets merged (#2216) (diff) | |
download | ferdium-app-53937fd58023ef800bd8ca1cd2b6d2d7bc891834.tar.gz ferdium-app-53937fd58023ef800bd8ca1cd2b6d2d7bc891834.tar.zst ferdium-app-53937fd58023ef800bd8ca1cd2b6d2d7bc891834.zip |
chore: update eslint deps to latest (#2213)
- update eslint deps to latest
- disable new react/function-component-definition rule
- fix/disable newly reported issues
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/appearance/index.ts | 33 | ||||
-rw-r--r-- | src/features/basicAuth/index.ts | 4 | ||||
-rw-r--r-- | src/features/quickSwitch/Component.js | 2 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspacesDashboard.js | 1 |
4 files changed, 21 insertions, 19 deletions
diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts index fe8793dc1..7a4307cfd 100644 --- a/src/features/appearance/index.ts +++ b/src/features/appearance/index.ts | |||
@@ -114,7 +114,12 @@ function generateAccentStyle(accentColorStr) { | |||
114 | `; | 114 | `; |
115 | } | 115 | } |
116 | 116 | ||
117 | function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical, isLabelEnabled) { | 117 | function generateServiceRibbonWidthStyle( |
118 | widthStr, | ||
119 | iconSizeStr, | ||
120 | vertical, | ||
121 | isLabelEnabled, | ||
122 | ) { | ||
118 | const width = Number(widthStr); | 123 | const width = Number(widthStr); |
119 | const iconSize = Number(iconSizeStr) - iconSizeBias; | 124 | const iconSize = Number(iconSizeStr) - iconSizeBias; |
120 | let fontSize = 11; | 125 | let fontSize = 11; |
@@ -122,33 +127,33 @@ function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical, isLabe | |||
122 | let sidebarSizeBias = 22; | 127 | let sidebarSizeBias = 22; |
123 | const tabItemWidthBias = 2; | 128 | const tabItemWidthBias = 2; |
124 | 129 | ||
125 | switch(width){ | 130 | switch (width) { |
126 | case (35): | 131 | case 35: |
127 | fontSize = 9; | 132 | fontSize = 9; |
128 | tabItemHeightBias = 25; | 133 | tabItemHeightBias = 25; |
129 | sidebarSizeBias = 48; | 134 | sidebarSizeBias = 48; |
130 | break; | 135 | break; |
131 | case (45): | 136 | case 45: |
132 | fontSize = 10; | 137 | fontSize = 10; |
133 | tabItemHeightBias = 21; | 138 | tabItemHeightBias = 21; |
134 | sidebarSizeBias = 44; | 139 | sidebarSizeBias = 44; |
135 | break; | 140 | break; |
136 | case (55): | 141 | case 55: |
137 | fontSize = 11; | 142 | fontSize = 11; |
138 | tabItemHeightBias = 13; | 143 | tabItemHeightBias = 13; |
139 | sidebarSizeBias = 37; | 144 | sidebarSizeBias = 37; |
140 | break; | 145 | break; |
141 | case (80): | 146 | case 80: |
142 | fontSize = 11; | 147 | fontSize = 11; |
143 | tabItemHeightBias = 3; | 148 | tabItemHeightBias = 3; |
144 | sidebarSizeBias = 27; | 149 | sidebarSizeBias = 27; |
145 | break; | 150 | break; |
146 | case (90): | 151 | case 90: |
147 | fontSize = 12; | 152 | fontSize = 12; |
148 | tabItemHeightBias = 0; | 153 | tabItemHeightBias = 0; |
149 | sidebarSizeBias = 25; | 154 | sidebarSizeBias = 25; |
150 | break; | 155 | break; |
151 | case (100): | 156 | case 100: |
152 | fontSize = 13; | 157 | fontSize = 13; |
153 | tabItemHeightBias = 2; | 158 | tabItemHeightBias = 2; |
154 | sidebarSizeBias = 25; | 159 | sidebarSizeBias = 25; |
@@ -159,7 +164,7 @@ function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical, isLabe | |||
159 | sidebarSizeBias = 37; | 164 | sidebarSizeBias = 37; |
160 | } | 165 | } |
161 | 166 | ||
162 | if(!isLabelEnabled){ | 167 | if (!isLabelEnabled) { |
163 | sidebarSizeBias = 22; | 168 | sidebarSizeBias = 22; |
164 | tabItemHeightBias = -5; | 169 | tabItemHeightBias = -5; |
165 | } | 170 | } |
@@ -317,7 +322,7 @@ function generateStyle(settings) { | |||
317 | serviceRibbonWidth, | 322 | serviceRibbonWidth, |
318 | iconSize, | 323 | iconSize, |
319 | useVerticalStyle, | 324 | useVerticalStyle, |
320 | showServiceName | 325 | showServiceName, |
321 | ); | 326 | ); |
322 | } | 327 | } |
323 | if (showDragArea) { | 328 | if (showDragArea) { |
diff --git a/src/features/basicAuth/index.ts b/src/features/basicAuth/index.ts index 149ab6c19..8e8fa186c 100644 --- a/src/features/basicAuth/index.ts +++ b/src/features/basicAuth/index.ts | |||
@@ -1,7 +1,5 @@ | |||
1 | import { AuthInfo, BrowserWindow, ipcRenderer } from 'electron'; | 1 | import { AuthInfo, BrowserWindow, ipcRenderer } from 'electron'; |
2 | 2 | ||
3 | import BasicAuthComponent from './Component'; | ||
4 | |||
5 | import { state as ModalState } from './store'; | 3 | import { state as ModalState } from './store'; |
6 | 4 | ||
7 | const debug = require('debug')('Ferdi:feature:basicAuth'); | 5 | const debug = require('debug')('Ferdi:feature:basicAuth'); |
@@ -31,4 +29,4 @@ export function mainIpcHandler(mainWindow: BrowserWindow, authInfo: AuthInfo) { | |||
31 | }); | 29 | }); |
32 | } | 30 | } |
33 | 31 | ||
34 | export const Component = BasicAuthComponent; | 32 | export { default as Component } from './Component'; |
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js index d5cb9179f..75587cc1d 100644 --- a/src/features/quickSwitch/Component.js +++ b/src/features/quickSwitch/Component.js | |||
@@ -99,8 +99,6 @@ class QuickSwitchModal extends Component { | |||
99 | 99 | ||
100 | ARROW_UP = 38; | 100 | ARROW_UP = 38; |
101 | 101 | ||
102 | SHIFT = 16; | ||
103 | |||
104 | ENTER = 13; | 102 | ENTER = 13; |
105 | 103 | ||
106 | TAB = 9; | 104 | TAB = 9; |
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index d41536f31..1087580b1 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js | |||
@@ -1,3 +1,4 @@ | |||
1 | /* eslint-disable react/jsx-no-useless-fragment */ | ||
1 | import { Component } from 'react'; | 2 | import { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 3 | import PropTypes from 'prop-types'; |
3 | import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; | 4 | import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; |