refactor(styles): sort defineProps, defineEmits with TS type

soybeanjs · Jan 25, 2024 · 37a64a5 · 37a64a5
1 parent 9895a37
commit 37a64a5
Show file tree

Hide file tree

Showing 24 changed files with 94 additions and 91 deletions.
diff --git a/packages/materials/src/libs/admin-layout/index.vue b/packages/materials/src/libs/admin-layout/index.vue
@@ -28,15 +28,13 @@ const props = withDefaults(defineProps<AdminLayoutProps>(), {
   rightFooter: false
 });
 
-const emit = defineEmits<Emits>();
-
-const slots = defineSlots<Slots>();
-
 interface Emits {
   /** Update siderCollapse */
   (e: 'update:siderCollapse', collapse: boolean): void;
 }
 
+const emit = defineEmits<Emits>();
+
 type SlotFn = (props?: Record<string, unknown>) => any;
 
 type Slots = {
@@ -51,6 +49,9 @@ type Slots = {
   /** Footer */
   footer?: SlotFn;
 };
+
+const slots = defineSlots<Slots>();
+
 const cssVars = computed(() => createLayoutCssVars(props));
 
 // config visible

diff --git a/packages/materials/src/libs/color-picker/index.vue b/packages/materials/src/libs/color-picker/index.vue
@@ -7,6 +7,12 @@ defineOptions({
   name: 'ColorPicker'
 });
 
+interface Props {
+  color: string;
+  palettes?: string[];
+  disabled?: boolean;
+}
+
 const props = withDefaults(defineProps<Props>(), {
   palettes: () => [
     '#3b82f6',
@@ -29,18 +35,12 @@ const props = withDefaults(defineProps<Props>(), {
   ]
 });
 
-const emit = defineEmits<Emits>();
-
-interface Props {
-  color: string;
-  palettes?: string[];
-  disabled?: boolean;
-}
-
 interface Emits {
   (e: 'update:color', value: string): void;
 }
 
+const emit = defineEmits<Emits>();
+
 const domRef = ref<HTMLElement | null>(null);
 const instance = ref<ColorPicker | null>(null);
 

diff --git a/packages/materials/src/libs/page-tab/button-tab.vue b/packages/materials/src/libs/page-tab/button-tab.vue
@@ -8,8 +8,6 @@ defineOptions({
 
 defineProps<PageTabProps>();
 
-defineSlots<Slots>();
-
 type SlotFn = (props?: Record<string, unknown>) => any;
 
 type Slots = {
@@ -32,6 +30,8 @@ type Slots = {
    */
   suffix?: SlotFn;
 };
+
+defineSlots<Slots>();
 </script>
 
 <template>

diff --git a/packages/materials/src/libs/page-tab/chrome-tab.vue b/packages/materials/src/libs/page-tab/chrome-tab.vue
@@ -9,8 +9,6 @@ defineOptions({
 
 defineProps<PageTabProps>();
 
-defineSlots<Slots>();
-
 type SlotFn = (props?: Record<string, unknown>) => any;
 
 type Slots = {
@@ -33,6 +31,8 @@ type Slots = {
    */
   suffix?: SlotFn;
 };
+
+defineSlots<Slots>();
 </script>
 
 <template>

diff --git a/packages/materials/src/libs/page-tab/index.vue b/packages/materials/src/libs/page-tab/index.vue
@@ -19,14 +19,12 @@ const props = withDefaults(defineProps<PageTabProps>(), {
   closable: true
 });
 
-const emit = defineEmits<Emits>();
-
-defineSlots<Slots>();
-
 interface Emits {
   (e: 'close'): void;
 }
 
+const emit = defineEmits<Emits>();
+
 type SlotFn = (props?: Record<string, unknown>) => any;
 
 type Slots = {
@@ -50,6 +48,8 @@ type Slots = {
   suffix?: SlotFn;
 };
 
+defineSlots<Slots>();
+
 const activeTabComponent = computed(() => {
   const { mode, chromeClass, buttonClass } = props;
 

diff --git a/src/components/common/dark-mode-container.vue b/src/components/common/dark-mode-container.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 defineOptions({ name: 'DarkModeContainer' });
 
-defineProps<Props>();
-
 interface Props {
   inverted?: boolean;
 }
+
+defineProps<Props>();
 </script>
 
 <template>

diff --git a/src/components/common/exception-base.vue b/src/components/common/exception-base.vue
@@ -4,8 +4,6 @@ import { $t } from '@/locales';
 
 defineOptions({ name: 'ExceptionBase' });
 
-const props = defineProps<Props>();
-
 type ExceptionType = '403' | '404' | '500';
 
 interface Props {
@@ -19,6 +17,8 @@ interface Props {
   type: ExceptionType;
 }
 
+const props = defineProps<Props>();
+
 const iconMap: Record<ExceptionType, string> = {
   '403': 'no-permission',
   '404': 'not-found',

diff --git a/src/components/common/full-screen.vue b/src/components/common/full-screen.vue
@@ -5,11 +5,11 @@ defineOptions({
   name: 'FullScreen'
 });
 
-defineProps<Props>();
-
 interface Props {
   full?: boolean;
 }
+
+defineProps<Props>();
 </script>
 
 <template>

diff --git a/src/components/common/lang-switch.vue b/src/components/common/lang-switch.vue
@@ -6,12 +6,6 @@ defineOptions({
   name: 'LangSwitch'
 });
 
-const props = withDefaults(defineProps<Props>(), {
-  showTooltip: true
-});
-
-const emit = defineEmits<Emits>();
-
 interface Props {
   /** Current language */
   lang: App.I18n.LangType;
@@ -21,10 +15,16 @@ interface Props {
   showTooltip?: boolean;
 }
 
+const props = withDefaults(defineProps<Props>(), {
+  showTooltip: true
+});
+
 type Emits = {
   (e: 'changeLang', lang: App.I18n.LangType): void;
 };
 
+const emit = defineEmits<Emits>();
+
 const tooltipContent = computed(() => {
   if (!props.showTooltip) return '';
 

diff --git a/src/components/common/menu-toggler.vue b/src/components/common/menu-toggler.vue
@@ -4,15 +4,15 @@ import { $t } from '@/locales';
 
 defineOptions({ name: 'MenuToggler' });
 
-const props = defineProps<Props>();
-
 interface Props {
   /** Show collapsed icon */
   collapsed?: boolean;
   /** Arrow style icon */
   arrowIcon?: boolean;
 }
 
+const props = defineProps<Props>();
+
 type NumberBool = 0 | 1;
 
 const icon = computed(() => {

diff --git a/src/components/common/pin-toggler.vue b/src/components/common/pin-toggler.vue
@@ -4,12 +4,12 @@ import { $t } from '@/locales';
 
 defineOptions({ name: 'PinToggler' });
 
-const props = defineProps<Props>();
-
 interface Props {
   pin?: boolean;
 }
 
+const props = defineProps<Props>();
+
 const icon = computed(() => (props.pin ? 'mdi-pin-off' : 'mdi-pin'));
 </script>
 

diff --git a/src/components/common/reload-button.vue b/src/components/common/reload-button.vue
@@ -5,11 +5,11 @@ defineOptions({
   name: 'ReloadButton'
 });
 
-defineProps<Props>();
-
 interface Props {
   loading?: boolean;
 }
+
+defineProps<Props>();
 </script>
 
 <template>

diff --git a/src/components/common/theme-schema-switch.vue b/src/components/common/theme-schema-switch.vue
@@ -5,13 +5,6 @@ import { $t } from '@/locales';
 
 defineOptions({ name: 'ThemeSchemaSwitch' });
 
-const props = withDefaults(defineProps<Props>(), {
-  showTooltip: true,
-  tooltipPlacement: 'bottom'
-});
-
-const emit = defineEmits<Emits>();
-
 interface Props {
   /** Theme schema */
   themeSchema: UnionKey.ThemeScheme;
@@ -21,10 +14,17 @@ interface Props {
   tooltipPlacement?: TooltipPlacement;
 }
 
+const props = withDefaults(defineProps<Props>(), {
+  showTooltip: true,
+  tooltipPlacement: 'bottom'
+});
+
 interface Emits {
   (e: 'switch'): void;
 }
 
+const emit = defineEmits<Emits>();
+
 function handleSwitch() {
   emit('switch');
 }

diff --git a/src/components/custom/better-scroll.vue b/src/components/custom/better-scroll.vue
@@ -6,8 +6,6 @@ import type { Options } from '@better-scroll/core';
 
 defineOptions({ name: 'BetterScroll' });
 
-const props = defineProps<Props>();
-
 interface Props {
   /**
    * BetterScroll options
@@ -17,6 +15,8 @@ interface Props {
   options: Options;
 }
 
+const props = defineProps<Props>();
+
 const bsWrap = ref<HTMLElement>();
 const bsContent = ref<HTMLElement>();
 const { width: wrapWidth } = useElementSize(bsWrap);

diff --git a/src/components/custom/button-icon.vue b/src/components/custom/button-icon.vue
@@ -8,14 +8,6 @@ defineOptions({
   inheritAttrs: false
 });
 
-const props = withDefaults(defineProps<Props>(), {
-  class: 'h-36px text-icon',
-  icon: '',
-  tooltipContent: '',
-  tooltipPlacement: 'bottom',
-  triggerParent: false
-});
-
 interface Props {
   /** Button class */
   class?: string;
@@ -29,6 +21,14 @@ interface Props {
   triggerParent?: boolean;
 }
 
+const props = withDefaults(defineProps<Props>(), {
+  class: 'h-36px text-icon',
+  icon: '',
+  tooltipContent: '',
+  tooltipPlacement: 'bottom',
+  triggerParent: false
+});
+
 interface ButtonProps {
   className: string;
 }

diff --git a/src/components/custom/svg-icon.vue b/src/components/custom/svg-icon.vue
@@ -4,8 +4,6 @@ import { Icon } from '@iconify/vue';
 
 defineOptions({ name: 'SvgIcon' });
 
-const props = defineProps<Props>();
-
 /**
  * Props
  *
@@ -19,6 +17,8 @@ interface Props {
   localIcon?: string;
 }
 
+const props = defineProps<Props>();
+
 const attrs = useAttrs();
 
 const bindAttrs = computed<{ class: string; style: string }>(() => ({

diff --git a/src/layouts/modules/global-content/index.vue b/src/layouts/modules/global-content/index.vue
@@ -7,15 +7,15 @@ defineOptions({
   name: 'GlobalContent'
 });
 
-withDefaults(defineProps<Props>(), {
-  showPadding: true
-});
-
 interface Props {
   /** Show padding for content */
   showPadding?: boolean;
 }
 
+withDefaults(defineProps<Props>(), {
+  showPadding: true
+});
+
 const appStore = useAppStore();
 const themeStore = useThemeStore();
 const routeStore = useRouteStore();

diff --git a/src/layouts/modules/global-header/index.vue b/src/layouts/modules/global-header/index.vue
@@ -14,12 +14,6 @@ import UserAvatar from './components/user-avatar.vue';
 defineOptions({
   name: 'GlobalHeader'
 });
-defineProps<Props>();
-const appStore = useAppStore();
-const themeStore = useThemeStore();
-const routeStore = useRouteStore();
-const { isFullscreen, toggle } = useFullscreen();
-const { menus } = useMixMenuContext();
 
 interface Props {
   /** Whether to show the logo */
@@ -30,6 +24,14 @@ interface Props {
   showMenu?: App.Global.HeaderProps['showMenu'];
 }
 
+defineProps<Props>();
+
+const appStore = useAppStore();
+const themeStore = useThemeStore();
+const routeStore = useRouteStore();
+const { isFullscreen, toggle } = useFullscreen();
+const { menus } = useMixMenuContext();
+
 const headerMenus = computed(() => {
   if (themeStore.layout.mode === 'horizontal') {
     return routeStore.menus;