fix: style dependencies missing in on-demand import entries (#1755)

IDuxFE · Dec 11, 2023 · 0bd7cc9 · 0bd7cc9
1 parent 8c19135
commit 0bd7cc9
Show file tree

Hide file tree

Showing 28 changed files with 72 additions and 12 deletions.
diff --git a/packages/components/_private/mask/style/index.less b/packages/components/_private/mask/style/index.less
@@ -1,5 +1,6 @@
 @import '../../../style/variable/index.less';
 @import '../../../style/mixins/box.less';
+@import '../../../style/motion/fade.less';
 
 .@{mask-prefix} {
   .box(fixed);

diff --git a/packages/components/badge/demo/Basic.vue b/packages/components/badge/demo/Basic.vue
@@ -20,7 +20,7 @@ a {
   display: inline-block;
   width: 24px;
   height: 24px;
-  border: 1px solid var(--ix-border-color);
+  border: 1px solid var(--ix-color-border);
   border-radius: var(--ix-border-radius-sm);
 }
 </style>
diff --git a/packages/components/badge/demo/Count.vue b/packages/components/badge/demo/Count.vue
@@ -24,7 +24,7 @@ a {
   display: inline-block;
   width: 24px;
   height: 24px;
-  border: 1px solid var(--ix-border-color);
+  border: 1px solid var(--ix-color-border);
   border-radius: var(--ix-border-radius-sm);
 }
 </style>
diff --git a/packages/components/badge/demo/OverflowCount.vue b/packages/components/badge/demo/OverflowCount.vue
@@ -20,7 +20,7 @@ a {
   display: inline-block;
   width: 24px;
   height: 24px;
-  border: 1px solid var(--ix-border-color);
+  border: 1px solid var(--ix-color-border);
   border-radius: var(--ix-border-radius-sm);
 }
 </style>
diff --git a/packages/components/badge/demo/Processing.vue b/packages/components/badge/demo/Processing.vue
@@ -22,7 +22,7 @@ a {
   display: inline-block;
   width: 24px;
   height: 24px;
-  border: 1px solid var(--ix-border-color);
+  border: 1px solid var(--ix-color-border);
   border-radius: var(--ix-border-radius-sm);
 }
 </style>
diff --git a/packages/components/badge/demo/Status.vue b/packages/components/badge/demo/Status.vue
@@ -23,7 +23,7 @@ a {
   display: inline-block;
   width: 24px;
   height: 24px;
-  border: 1px solid var(--ix-border-color);
+  border: 1px solid var(--ix-color-border);
   border-radius: var(--ix-border-radius-sm);
 }
 </style>
diff --git a/packages/components/badge/demo/Title.vue b/packages/components/badge/demo/Title.vue
@@ -14,7 +14,7 @@ a {
   display: inline-block;
   width: 24px;
   height: 24px;
-  border: 1px solid var(--ix-border-color);
+  border: 1px solid var(--ix-color-border);
   border-radius: var(--ix-border-radius-sm);
 }
 </style>
diff --git a/packages/components/date-picker/style/index.ts b/packages/components/date-picker/style/index.ts
@@ -4,5 +4,6 @@ import '@idux/components/_private/overlay/style'
 import '@idux/components/_private/trigger/style'
 import '@idux/components/icon/style'
 import '@idux/components/input/style'
+import '@idux/components/time-picker/style'
 
 import './index.less'
diff --git a/packages/components/drawer/style/index.less b/packages/components/drawer/style/index.less
@@ -1,6 +1,7 @@
 @import '../../style/variable/index.less';
 @import '../../style/mixins/box.less';
 @import '../../style/mixins/reset.less';
+@import '../../style//motion/move.less';
 
 .@{drawer-prefix} {
   .reset-component-new();

diff --git a/packages/components/drawer/style/index.ts b/packages/components/drawer/style/index.ts
@@ -1,5 +1,5 @@
 // style dependencies
-
+import '@idux/components/_private/mask/style'
 import '@idux/components/button/style'
 import '@idux/components/header/style'
 import '@idux/components/icon/style'

diff --git a/packages/components/image/src/Image.tsx b/packages/components/image/src/Image.tsx
@@ -14,9 +14,11 @@ import { computed, defineComponent, normalizeClass, ref, watch } from 'vue'
 import { callEmit } from '@idux/cdk/utils'
 import { useGlobalConfig } from '@idux/components/config'
 import { IxIcon } from '@idux/components/icon'
+import { useThemeToken } from '@idux/components/theme'
 
 import ImageViewer from './ImageViewer'
 import { imageProps } from './types'
+import { getThemeTokens } from '../theme'
 
 export default defineComponent({
   name: 'IxImage',
@@ -25,13 +27,18 @@ export default defineComponent({
   setup(props, { attrs, slots }) {
     const { class: className, style, ...rest } = attrs
     const common = useGlobalConfig('common')
+    const { globalHashId, hashId, registerToken } = useThemeToken('image')
+    registerToken(getThemeTokens)
+
     const mergedPrefixCls = computed(() => `${common.prefixCls}-image`)
     const config = useGlobalConfig('image')
     const preview = usePreview(props, config)
     const { status, setFailed, setLoaded } = useStatus(props)
     const [viewerVisible, setVisible] = useViewerVisible()
     const { outerClasses, overLayerClasses, imageClasses } = useClasses(
       mergedPrefixCls,
+      globalHashId,
+      hashId,
       className as string,
       status,
       preview,
@@ -102,13 +109,17 @@ function useViewerVisible(): [Ref<boolean>, (visible: boolean) => void] {
 
 function useClasses(
   mergedPrefixCls: ComputedRef<string>,
+  globalHashId: ComputedRef<string>,
+  hashId: ComputedRef<string>,
   className: string,
   status: Ref<ImageStatus>,
   preview: ComputedRef<boolean>,
 ) {
   const outerClasses = computed(() =>
     normalizeClass([
       mergedPrefixCls.value,
+      globalHashId.value,
+      hashId.value,
       className,
       `${mergedPrefixCls.value}-${status.value}`,
       { [`${mergedPrefixCls.value}-preview`]: preview.value },

diff --git a/packages/components/image/src/ImageViewer.tsx b/packages/components/image/src/ImageViewer.tsx
@@ -11,11 +11,13 @@ import { isFirefox } from '@idux/cdk/platform'
 import { CdkPortal } from '@idux/cdk/portal'
 import { useControlledProp } from '@idux/cdk/utils'
 import { useGlobalConfig } from '@idux/components/config'
+import { useThemeToken } from '@idux/components/theme'
 import { usePortalTarget, useZIndex } from '@idux/components/utils'
 
 import { useImgStyleOpr, useImgSwitch, useOprList } from './composables/useOpr'
 import OprIcon from './contents/OprIcon'
 import { imageViewerProps } from './types'
+import { getThemeTokens } from '../theme'
 
 const mousewheelEventName = isFirefox ? 'DOMMouseScroll' : 'mousewheel'
 
@@ -27,6 +29,8 @@ export default defineComponent({
   props: imageViewerProps,
   setup(props) {
     const common = useGlobalConfig('common')
+    const { globalHashId, hashId, registerToken } = useThemeToken('image')
+    registerToken(getThemeTokens)
     const config = useGlobalConfig('imageViewer')
     const mergedPrefixCls = computed(() => `${common.prefixCls}-image-viewer`)
     const mergedPortalTarget = usePortalTarget(props, config, common, mergedPrefixCls)
@@ -79,7 +83,7 @@ export default defineComponent({
         <CdkPortal target={mergedPortalTarget.value} load={visible.value}>
           <Transition name={`${common.prefixCls}-zoom`} appear>
             {visible.value && (
-              <div class={prefixCls} style={style.value}>
+              <div class={[prefixCls, globalHashId.value, hashId.value]} style={style.value}>
                 <div class={`${prefixCls}-opr`}>
                   {oprList.value
                     .filter(item => item.visible)

diff --git a/packages/components/image/style/index.less b/packages/components/image/style/index.less
@@ -1,6 +1,8 @@
 @import '../../style/variable/index.less';
 @import '../../style/mixins/reset.less';
 
+@import './viewer.less';
+
 .@{image-prefix} {
   .reset-component();
 

diff --git a/packages/components/image/style/index.ts b/packages/components/image/style/index.ts
@@ -1,3 +1,4 @@
 // style dependencies
+import '@idux/components/icon/style'
 
 import './index.less'
diff --git a/packages/components/notification/src/NotificationProvider.tsx b/packages/components/notification/src/NotificationProvider.tsx
@@ -21,11 +21,13 @@ import { isArray, isUndefined, pickBy } from 'lodash-es'
 import { CdkPortal } from '@idux/cdk/portal'
 import { VKey, callEmit, convertArray, convertCssPixel, uniqueId } from '@idux/cdk/utils'
 import { useGlobalConfig } from '@idux/components/config'
+import { useThemeToken } from '@idux/components/theme'
 import { usePortalTarget } from '@idux/components/utils'
 
 import Notification from './Notification'
 import { NOTIFICATION_PROVIDER_TOKEN } from './token'
 import { notificationPlacement, notificationProviderProps, notificationType } from './types'
+import { getThemeTokens, transforms } from '../theme'
 
 const groupPositions = {
   topStart: ['top', 'left'],
@@ -40,6 +42,9 @@ export default defineComponent({
   props: notificationProviderProps,
   setup(props, { slots, expose }) {
     const commonCfg = useGlobalConfig('common')
+    const { globalHashId, hashId, registerToken } = useThemeToken('notification')
+    registerToken(getThemeTokens, transforms)
+
     const config = useGlobalConfig('notification')
     const mergedPrefixCls = computed(() => `${commonCfg.prefixCls}-notification`)
     const mergedPortalTarget = usePortalTarget(props, config, commonCfg, mergedPrefixCls)
@@ -79,7 +84,12 @@ export default defineComponent({
             tag="div"
             appear
             name={moveName}
-            class={[`${mergedPrefixCls.value}-wrapper`, `${mergedPrefixCls.value}-wrapper-${placement}`]}
+            class={[
+              `${mergedPrefixCls.value}-wrapper`,
+              `${mergedPrefixCls.value}-wrapper-${placement}`,
+              globalHashId.value,
+              hashId.value,
+            ]}
             style={position}
           >
             {child}

diff --git a/packages/components/popover/style/index.ts b/packages/components/popover/style/index.ts
@@ -1,5 +1,7 @@
 // style dependencies
 
 import '@idux/components/_private/overlay/style'
+import '@idux/components/header/style'
+import '@idux/components/icon/style'
 
 import './index.less'
diff --git a/packages/components/radio/src/Radio.tsx b/packages/components/radio/src/Radio.tsx
@@ -14,6 +14,7 @@ import { isNil } from 'lodash-es'
 import { useAccessorAndControl } from '@idux/cdk/forms'
 import { callEmit, useKey } from '@idux/cdk/utils'
 import { ɵWave, type ɵWaveInstance } from '@idux/components/_private/wave'
+import { getButtonThemeTokens } from '@idux/components/button'
 import { useGlobalConfig } from '@idux/components/config'
 import { FORM_TOKEN, useFormElement, useFormItemRegister } from '@idux/components/form'
 import { useThemeToken } from '@idux/components/theme'
@@ -37,8 +38,9 @@ export default defineComponent({
     const key = useKey()
     const common = useGlobalConfig('common')
     const { globalHashId, hashId, registerToken } = useThemeToken('radio')
-    const { hashId: buttonHashId } = useThemeToken('button')
+    const { hashId: buttonHashId, registerToken: registerButtonTokens } = useThemeToken('button')
     registerToken(getThemeTokens)
+    registerButtonTokens(getButtonThemeTokens)
 
     const mergedPrefixCls = computed(() => `${common.prefixCls}-radio`)
     const config = useGlobalConfig('radio')

diff --git a/packages/components/select/style/index.ts b/packages/components/select/style/index.ts
@@ -1,6 +1,8 @@
 // style dependencies
 
 import '@idux/components/_private/selector/style'
+import '@idux/components/_private/overflow/style'
+import '@idux/components/_private/overlay/style'
 import '@idux/components/checkbox/style'
 import '@idux/components/empty/style'
 import '@idux/components/icon/style'

diff --git a/packages/components/slider/style/index.ts b/packages/components/slider/style/index.ts
@@ -1,3 +1,4 @@
 // style dependencies
+import '@idux/components/tooltip/style'
 
 import './index.less'
diff --git a/packages/components/tabs/style/index.ts b/packages/components/tabs/style/index.ts
@@ -1,5 +1,7 @@
 // style dependencies
 
 import '@idux/components/icon/style'
+import '@idux/components/popover/style'
+import '@idux/components/select/style'
 
 import './index.less'
diff --git a/packages/components/tour/src/Mask.tsx b/packages/components/tour/src/Mask.tsx
@@ -7,17 +7,26 @@
 
 import { computed, defineComponent, inject, normalizeClass } from 'vue'
 
+import { useThemeToken } from '@idux/components/theme'
+
 import { tourToken } from './token'
 
 export default defineComponent({
   setup() {
+    const { globalHashId, hashId } = useThemeToken('tour')
     const { mergedPrefixCls, mergedProps, maskPath, maskAttrs, maskClass, maskStyle } = inject(tourToken)!
 
     const classes = computed(() => {
       const prefixCls = `${mergedPrefixCls.value}-mask`
       const { animatable } = mergedProps.value
 
-      return normalizeClass([prefixCls, maskClass.value, animatable ? `${prefixCls}-animatable` : undefined])
+      return normalizeClass([
+        prefixCls,
+        globalHashId.value,
+        hashId.value,
+        maskClass.value,
+        animatable ? `${prefixCls}-animatable` : undefined,
+      ])
     })
 
     return () => {

diff --git a/packages/components/tour/style/index.less b/packages/components/tour/style/index.less
@@ -1,5 +1,6 @@
 @import '../../style/variable/index.less';
 @import '../../style/mixins/reset.less';
+@import '../../style/motion/fade.less';
 
 .@{tour-prefix} {
   &-mask {

diff --git a/packages/components/tour/style/index.ts b/packages/components/tour/style/index.ts
@@ -1,5 +1,7 @@
 // style dependencies
 
 import '@idux/components/_private/overlay/style'
+import '@idux/components/header/style'
+import '@idux/components/button/style'
 
 import './index.less'
diff --git a/packages/components/tree-select/style/index.ts b/packages/components/tree-select/style/index.ts
@@ -1,6 +1,7 @@
 // style dependencies
 
 import '@idux/components/_private/selector/style'
+import '@idux/components/_private/overflow/style'
 import '@idux/components/tree/style'
 import '@idux/components/input/style'
 

diff --git a/packages/pro/search/style/index.ts b/packages/pro/search/style/index.ts
@@ -1,4 +1,6 @@
 // style dependencies
+import '@idux/components/_private/overflow/style'
+import '@idux/components/_private/overlay/style'
 import '@idux/components/icon/style'
 import '@idux/components/select/style'
 import '@idux/components/tree/style'

diff --git a/packages/pro/textarea/style/index.ts b/packages/pro/textarea/style/index.ts
@@ -1,4 +1,5 @@
 // style dependencies
 import '@idux/components/tooltip/style'
+import '@idux/components/icon/style'
 
 import './index.less'
diff --git a/packages/pro/transfer/style/index.ts b/packages/pro/transfer/style/index.ts
@@ -1,6 +1,7 @@
 // style dependencies
 
-import '@idux/components/table/style'
+import '@idux/pro/table/style'
 import '@idux/components/tree/style'
+import '@idux/components/transfer/style'
 
 import './index.less'
diff --git a/packages/pro/tree/style/index.ts b/packages/pro/tree/style/index.ts
@@ -3,5 +3,8 @@
 import '@idux/components/icon/style'
 import '@idux/components/button/style'
 import '@idux/components/divider/style'
+import '@idux/components/header/style'
+import '@idux/components/input/style'
+import '@idux/components/tree/style'
 
 import './index.less'