Commit 097eb47e authored by Дмитрий Малюгин's avatar Дмитрий Малюгин 🕓
Browse files

fix: ts errors

parent c817a0c2

src/App.vue

+0 −2
Original line number Diff line number Diff line 
<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';

src/common/helpers/common.ts

+2 −1
Original line number Diff line number Diff line
@@ -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

src/stories/components/Popup/Popup.vue

+3 −3
Original line number Diff line number Diff line
@@ -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;

    });

  },

src/stories/components/Table/Table.vue

+3 −3
Original line number Diff line number Diff line
@@ -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,

  ),

src/stories/components/Table/helpers.ts

+1 −1
Original line number Diff line number Diff line
@@ -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);