diff --git a/src/App.vue b/src/App.vue index 8d91ab7f7181ad8ee45bc19563ee3fe3ba8db875..00f92a09fc1117344fa8467a2109ace7a3c7c626 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,4 @@ <script setup lang="ts"> -import Drawer from '@stories/components/Drawer/Drawer.vue'; -import { ref } from 'vue'; import Age18Icon from '@stories/icons/Mono/Age18Icon.vue'; import AlarmIcon from '@stories/icons/Mono/AlarmIcon.vue'; import AirplaneIcon from '@stories/icons/Mono/AirplaneIcon.vue'; diff --git a/src/common/helpers/common.ts b/src/common/helpers/common.ts index 3da75fb1eca49d769a369250cb1491ffbcd3b78a..f3e9829a68af190daba4b35e14fcc84d97a8cebc 100644 --- a/src/common/helpers/common.ts +++ b/src/common/helpers/common.ts @@ -36,7 +36,7 @@ export const convertThemeToTextColor = (theme: TThemeColor, darkness: TDarkness /** * Convert color of type TThemeColor to shade of black or white */ -export const convertWhiteOrBlackToColor = (theme: 'white' | 'black', darkness: TDarkness) => { +export const convertWhiteOrBlackToColor = (theme: 'white' | 'black', darkness: TDarkness): string => { if (theme === 'white') { if (darkness === '500' || darkness === '400' || darkness === '600') return '#94a3b8'; if (darkness === '300' || darkness === '700') return '#cbd5e1'; @@ -47,6 +47,7 @@ export const convertWhiteOrBlackToColor = (theme: 'white' | 'black', darkness: T if (darkness === '300' || darkness === '700') return '#374151'; if (darkness === '200' || darkness === '800') return '#1f2937'; if (darkness === '100' || darkness === '900') return '#111827'; + return '#4b5563'; }; /** * Convert color of type TThemeColor to hex for border or scroll diff --git a/src/stories/components/Popup/Popup.vue b/src/stories/components/Popup/Popup.vue index dc2b20f8a159f86650aa9df2068a2553fa2d3755..d1eaa9824855da8e7fa83f74cff3aa31ccd49cbe 100644 --- a/src/stories/components/Popup/Popup.vue +++ b/src/stories/components/Popup/Popup.vue @@ -39,7 +39,7 @@ watch( left.value = props.left ?? clientRect.left; } - container.value.addEventListener('pointerdown', (event: Event) => { + container.value.addEventListener('pointerdown', (event: MouseEvent) => { const e = event as PointerEvent; if (e.button === 2 || (props.buttonMenu && e.button === 0)) { isOnContainerClick.value = true; @@ -51,12 +51,12 @@ watch( e.stopPropagation(); } }); - container.value.addEventListener('contextmenu', (e) => { + container.value.addEventListener('contextmenu', (e: MouseEvent) => { if (isOnContainerClick.value) e.preventDefault(); }); } - document.addEventListener('pointerdown', (e) => { + document.addEventListener('pointerdown', (e: MouseEvent) => { if (!props.buttonMenu && e.button === 0 && !(window as CustomWindow).blockPopupActions) active.value = false; }); }, diff --git a/src/stories/components/Table/Table.vue b/src/stories/components/Table/Table.vue index 5a254bc854dcff0f920ef5c699b143bd68a204cf..d536bb9d09541e662180ab67c32323c4b3a3abea 100644 --- a/src/stories/components/Table/Table.vue +++ b/src/stories/components/Table/Table.vue @@ -23,7 +23,7 @@ const isRegisterSensitive = ref<boolean>(false); watch(props.columns, () => (columns.value = props.columns)); -const initGap = computed(() => calcGap(props.gap, props.fontSize)); +const initGap = computed(() => calcGap(props.gap ?? '0px', props.fontSize)); const additionalHeightFromSize = computed(() => calcAdditionalHeight(props.size, props.fontSize)); const themeColor = computed(() => convertThemeToColor(props.theme, props.darknessTheme)); const color = computed(() => @@ -31,7 +31,7 @@ const color = computed(() => ? convertThemeToColor(props.textColor, props.darknessTextColor) : convertThemeToTextColor(props.theme, props.darknessTheme), ); -const secondaryColor = computed(() => convertThemeToSecondaryColor(props.theme, props.darknessTheme)); +const secondaryColor = computed<string>(() => convertThemeToSecondaryColor(props.theme, props.darknessTheme)); const darkCellColor = computed(() => convertThemeToSecondaryColor(props.theme, String(+props.darknessTheme + 300))); // ['', 'up', 'none', '', 'none', ...] const sortState = computed<string[]>(() => { @@ -47,7 +47,7 @@ const rows = computed<ITableItem[][]>(() => sortStateActive.value, props.multipleSort, columnToFilter.value, - props.columns[columnToFilter.value ?? 0].type, + props.columns[columnToFilter.value ?? 0].type ?? 'text', filterValue.value, isRegisterSensitive.value, ), diff --git a/src/stories/components/Table/helpers.ts b/src/stories/components/Table/helpers.ts index 6ebe2797f615c95f0c3bcf94be426fb9ef87089e..fbb49f250259e3e91110056bdfa0744d04209d03 100644 --- a/src/stories/components/Table/helpers.ts +++ b/src/stories/components/Table/helpers.ts @@ -64,7 +64,7 @@ export const calcGap = (gap: string, fontSize: string) => export const calcAdditionalHeight = (size: TSize, fontSize: string) => { if (size === 'normal') return '0px'; - const isTwoLetters = isFinite(+fontSize.at(-3)!); + const isTwoLetters = isFinite(+fontSize[fontSize.length - 3]!); const value = isTwoLetters ? fontSize.slice(0, -2) : fontSize.slice(0, -3); const unit = isTwoLetters ? fontSize.slice(-2) : fontSize.slice(-3); diff --git a/tsconfig.app.json b/tsconfig.app.json index b5c26be5a9d5fdd76a0e64793a4653e0b7c7d3a5..0cd87b13437415f81546e00f5d07a5c9b1883b93 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -1,6 +1,6 @@ { "extends": "@vue/tsconfig/tsconfig.dom.json", - "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "App.vue"], + "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "src/**/*.ts","App.vue"], "exclude": ["src/**/__tests__/*"], "compilerOptions": { "composite": true,