chore: reorganize _base/... & styles/... files

src/_base/fade-in-expand-transition/index.js

@@ -0,0 +1,3 @@
+export {
+  default
+} from './src/FadeInExpandTransition'

src/_base/icon-switch-transition/index.js

@@ -0,0 +1,3 @@
+export {
+  default
+} from './src/IconSwitchTransition.js'

src/_base/index.js

@@ -1,2 +1,11 @@
-export { default as Teleport } from './teleport'
-export { default as LazyTeleport } from './lazy-teleport'
+export { default as NIconSwitchTransition } from './icon-switch-transition'
+export { default as NFadeInExpandTransition } from './fade-in-expand-transition'
+export { default as NBaseTeleport } from './teleport'
+export { default as NBaseLazyTeleport } from './lazy-teleport'
+export { default as NBaseFocusDetector } from './focus-detector'
+export { default as NBaseLoading } from './loading'
+export { default as NBaseSelectMenu } from './select-menu'
+export { default as NBaseSuffix } from './suffix'
+export { default as NBaseWave } from './wave'
+export { default as NBaseMenuMask } from './menu-mask'
+export { default as NBaseSelection } from './selection'

src/_base/slot-machine/src/SlotMachine.vue

@@ -28,9 +28,9 @@
 </template>
 
 <script>
-import NFadeInExpandTransition from '../../../_transition/FadeInExpandTransition'
+import { NFadeInExpandTransition } from '../../../_base'
 import SlotMachineNumber from './SlotMachineNumber.vue'
-import usecssr from '../../../_mixins/usecssr.js'
+import { usecssr } from '../../../_mixins'
 import styles from './styles/index.js'
 
 export default {

src/_base/suffix/src/Suffix.vue

@@ -10,7 +10,7 @@
       @mouseenter="handleMouseEnter"
       @mouseleave="handleMouseLeave"
     >
-      <icon-switch-transition>
+      <n-icon-switch-transition>
         <n-base-loading
           v-if="loading"
           key="loading"
@@ -37,14 +37,14 @@
             'n-base-suffix-arrow--disabled': disabled
           }"
         />
-      </icon-switch-transition>
+      </n-icon-switch-transition>
     </div>
   </transition>
 </template>
 
 <script>
 import CancelIcon from './CancelIcon.vue'
-import IconSwitchTransition from '../../../_transition/IconSwitchTransition'
+import { NIconSwitchTransition } from '../../../_base'
 import NBaseLoading from '../../loading'
 import {
   usecssr
@@ -56,7 +56,7 @@ export default {
   components: {
     CancelIcon,
     NBaseLoading,
-    IconSwitchTransition
+    NIconSwitchTransition
   },
   mixins: [
     usecssr(styles)

src/_composables/index.js

@@ -1 +0,0 @@
-export { default as useFormItem } from './use-form-item'

src/_mixins/index.js

@@ -1,3 +1,4 @@
+export { default as useAsFormItem } from './use-as-form-item'
 export { default as asformitem } from './asformitem'
 export { default as locale } from './locale'
 export { default as placeable } from './placeable/index'

src/_mixins/usecssr.js

@@ -1,5 +1,5 @@
 import { find } from '../_utils/cssr'
-import globalStyle from '../_styles/global-style/index.cssr.js'
+import globalStyle from '../_styles/global/index.cssr.js'
 import { warn } from '../_utils'
 
 if (__DEV__) {

src/_styles/base/dark.js

@@ -1,4 +1,4 @@
-import create from '../../_styles/utils/create-theme-base.js'
+import create from '../utils/create-theme-base.js'
 import { read, composite } from '../../_utils/color/index.js'
 import commonVariables from './_common.js'
 

src/_styles/global/index.cssr.js

@@ -1,5 +1,5 @@
 import { c, cB } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 export default c([
   // virtualScrollerStyle,

src/_styles/transitions/fade-down.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const {
   cubicBezierEaseInOut

src/_styles/transitions/fade-in-height-expand.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const cubicBezierEaseInOut = commonVariables.cubicBezierEaseInOut
 const cubicBezierEaseOut = commonVariables.cubicBezierEaseOut

src/_styles/transitions/fade-in-scale-up.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const {
   cubicBezierEaseIn,

src/_styles/transitions/fade-in-width-expand.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const cubicBezierEaseInOut = commonVariables.cubicBezierEaseInOut
 

src/_styles/transitions/fade-in.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const {
   cubicBezierEaseInOut

src/_styles/transitions/fade-up-width-expand.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const {
   cubicBezierEaseOut

src/_styles/transitions/icon-switch.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 export default function ({
   originalTransform = '',

src/_styles/transitions/slide-in-from-bottom.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const {
   cubicBezierEaseIn,

src/_styles/transitions/slide-in-from-left.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const {
   cubicBezierEaseIn,

src/_styles/transitions/slide-in-from-right.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const {
   cubicBezierEaseIn,

src/_styles/transitions/slide-in-from-top.js

@@ -1,5 +1,5 @@
 import { c, namespace } from '../../_utils/cssr'
-import commonVariables from '../../styles/base/_common'
+import commonVariables from '../base/_common'
 
 const {
   cubicBezierEaseIn,

src/_transition/IconSwitchTransition/index.js

@@ -1,7 +0,0 @@
-import IconTransition from './src/IconSwitchTransition.js'
-
-IconTransition.install = function (app) {
-  app.component(IconTransition.name, IconTransition)
-}
-
-export default IconTransition

src/alert/src/Alert.vue

@@ -69,7 +69,7 @@
 
 <script>
 import NIcon from '../../icon'
-import NFadeInExpandTransition from '../../_transition/FadeInExpandTransition'
+import { NFadeInExpandTransition } from '../../_base'
 import {
   configurable,
   themeable,

src/button/src/Button.vue

@@ -75,8 +75,7 @@ import {
   themeable,
   usecssr
 } from '../../_mixins'
-import NFadeInExpandTransition from '../../_transition/FadeInExpandTransition'
-import NIconSwitchTransition from '../../_transition/IconSwitchTransition'
+import { NFadeInExpandTransition, NIconSwitchTransition } from '../../_base'
 import NBaseLoading from '../../_base/loading'
 import NBaseWave from '../../_base/wave/index.js'
 import NIcon from '../../icon/index.js'

src/cascader/src/CascaderOption.vue

@@ -72,7 +72,7 @@
 import { computed, inject, toRef } from 'vue'
 import NCheckbox from '../../checkbox'
 import NBaseLoading from '../../_base/loading'
-import NIconSwitchTransition from '../../_transition/IconSwitchTransition'
+import { NIconSwitchTransition } from '../../_base'
 import { ChevronRightIcon, CheckmarkIcon } from '../../_base/icons'
 import { useMemo } from 'vooks'
 

src/cascader/src/composables.js

@@ -8,11 +8,11 @@ import {
   SubtreeNotLoadedError
 } from 'treemate'
 import { useIsMounted } from 'vooks'
-import { useFormItem } from '../../_composables'
+import { useAsFormItem } from '../../_mixins'
 import { call } from '../../_utils'
 
 export function useCascader (props) {
-  const formItem = useFormItem(props)
+  const formItem = useAsFormItem(props)
   const cascaderMenuRef = ref(null)
   const selectMenuRef = ref(null)
   const triggerRef = ref(null)

src/checkbox/src/Checkbox.vue

@@ -56,13 +56,13 @@ import { useMergedState, useMemo } from 'vooks'
 import {
   configurable,
   themeable,
-  asformitem
+  asformitem,
+  usecssr
 } from '../../_mixins'
 import { render } from '../../_utils/vue'
 import CheckMark from './CheckMark.vue'
 import LineMark from './LineMark.vue'
-import NIconSwitchTransition from '../../_transition/IconSwitchTransition'
-import usecssr from '../../_mixins/usecssr'
+import { NIconSwitchTransition } from '../../_base'
 import styles from './styles'
 import { warn, call } from '../../_utils'
 

src/collapse/src/CollapseItemContent.js

@@ -1,5 +1,5 @@
 import { h, withDirectives, vShow } from 'vue'
-import NFadeInExpandTransition from '../../_transition/FadeInExpandTransition'
+import { NFadeInExpandTransition } from '../../_base'
 
 export default {
   name: 'NCollapseItemContent',

src/loading-bar/src/LoadingBarProvider.js

@@ -1,6 +1,6 @@
 import { Fragment, h, ref } from 'vue'
 import { useIsMounted } from 'vooks'
-import { Teleport } from '../../_base'
+import { NBaseTeleport } from '../../_base'
 import NLoadingBar from './LoadingBar.vue'
 
 export default {
@@ -68,7 +68,7 @@ export default {
   },
   render () {
     return h(Fragment, null, [
-      h(Teleport, {
+      h(NBaseTeleport, {
         to: this.to
       }, {
         default: () => h(NLoadingBar, {

src/menu/src/Submenu.js

@@ -1,5 +1,5 @@
 import { h, withDirectives, vShow, ref } from 'vue'
-import NFadeInExpandTransition from '../../_transition/FadeInExpandTransition'
+import { NFadeInExpandTransition } from '../../_base'
 import NPopover from '../../popover/src/Popover'
 import NMenuItemContent from './MenuItemContent.vue'
 import menuChildMixin from './menu-child-mixin'

src/message/src/Message.js

@@ -8,7 +8,7 @@ import {
   CloseIcon
 } from '../../_base/icons'
 import NBaseLoading from '../../_base/loading'
-import IconSwitchTransition from '../../_transition/IconSwitchTransition'
+import { NIconSwitchTransition } from '../../_base'
 import { render } from '../../_utils/vue'
 import {
   configurable,
@@ -55,7 +55,7 @@ export default {
           size: 20
         }, {
           default: () => [
-            h(IconSwitchTransition, null, {
+            h(NIconSwitchTransition, null, {
               default: () => [
                 createIconVNode(icon, type, mergedTheme)
               ]

src/message/src/MessageProvider.js

@@ -1,6 +1,6 @@
 import { Fragment, ref, h, reactive } from 'vue'
 import { createId, omit } from '../../_utils/vue'
-import { Teleport } from '../../_base'
+import { NBaseTeleport } from '../../_base'
 import MessageEnvironment from './MessageEnvironment.js'
 
 export default {
@@ -65,7 +65,7 @@ export default {
   render () {
     return h(Fragment, null,
       [
-        this.messageList.length ? h(Teleport, {
+        this.messageList.length ? h(NBaseTeleport, {
           to: this.to
         }, {
           default: () => h('div', {

src/notification/src/NotificationProvider.js

@@ -1,6 +1,6 @@
 import { Fragment, h, reactive, ref } from 'vue'
 import { createId, omit } from '../../_utils/vue'
-import { Teleport } from '../../_base'
+import { NBaseTeleport } from '../../_base'
 import NotificationContainer from './NotificationContainer.vue'
 import NotificationEnvironment from './NotificationEnvironment'
 
@@ -69,7 +69,7 @@ export default {
   },
   render () {
     return h(Fragment, null, [
-      h(Teleport, {
+      h(NBaseTeleport, {
         to: this.to
       }, {
         default: () => this.notificationList.length ? h(NotificationContainer, {

src/steps/src/Step.vue

@@ -57,8 +57,8 @@ import {
   CloseIcon as ErrorIcon
 } from '../../_base/icons'
 import { themeable } from '../../_mixins'
+import { NIconSwitchTransition } from '../../_base'
 
-import NIconSwitchTransition from '../../_transition/IconSwitchTransition'
 export default {
   name: 'Step',
   components: {

src/styles/index.js

@@ -1,4 +1,6 @@
-/** internal style */
+// unified entry for styles
+
+// internal style
 export {
   baseMenuMaskDark,
   baseMenuMaskLight
@@ -23,11 +25,11 @@ export {
   baseSuffixDark,
   baseSuffixLight
 } from '../_base/suffix/styles'
-/** exposed style */
+// exposed style
 export {
   baseDark,
   baseLight
-} from './base'
+} from '../_styles/base'
 export {
   tabsDark,
   tabsLight

src/tree/src/TreeNode.js

@@ -2,7 +2,7 @@ import { h } from 'vue'
 import NTreeNodeSwitcher from './TreeNodeSwitcher.vue'
 import NTreeNodeCheckbox from './TreeNodeCheckbox.vue'
 import NTreeNodeContent from './TreeNodeContent.vue'
-import NFadeInExpandTransition from '../../_transition/FadeInExpandTransition'
+import { NFadeInExpandTransition } from '../../_base'
 
 import { isLeaf, isLoaded } from './utils'
 

src/tree/src/TreeNodeSwitcher.vue

@@ -23,7 +23,7 @@ import {
   MdArrowDropright
 } from 'vicons/ionicons-v4'
 import NBaseLoading from '../../_base/loading'
-import NIconSwitchTransition from '../../_transition/IconSwitchTransition'
+import { NIconSwitchTransition } from '../../_base'
 
 export default {
   name: 'NTreeSwitcher',

src/upload/src/Upload.vue

@@ -42,13 +42,13 @@
 <script>
 import {
   configurable,
-  themeable
+  themeable,
+  usecssr
 } from '../../_mixins'
 import { warn } from '../../_utils/naive'
 import { createId } from '../../_utils/vue'
 import NUploadFile from './UploadFile.vue'
-import NFadeInExpandTransition from '../../_transition/FadeInExpandTransition'
-import usecssr from '../../_mixins/usecssr'
+import { NFadeInExpandTransition } from '../../_base'
 import styles from './styles'
 
 /**

src/upload/src/UploadFile.vue

@@ -65,7 +65,7 @@ import {
   AttachOutline
 } from 'vicons/ionicons-v5'
 import NIcon from '../../icon'
-import NIconSwitchTransition from '../../_transition/IconSwitchTransition'
+import { NIconSwitchTransition } from '../../_base'
 import { warn } from '../../_utils/naive'
 
 export default {

src/upload/src/UploadProgress.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import NFadeInExpandTransition from '../../_transition/FadeInExpandTransition'
+import { NFadeInExpandTransition } from '../../_base'
 import NProgress from '../../progress/index.js'
 
 export default {