chore: some doc fixes & get rid of asthemecontext

demo/documentation/components/button/enUS/index.md

@@ -27,7 +27,7 @@ debug
 |circle|`boolean`|`false`||
 |round|`boolean`|`false`||
 |loading|`boolean`|`false`||
-|keyboard|`boolean`|`true`|Whether is supports keyboard operation.｜
+|keyboard|`boolean`|`true`|Whether is supports keyboard operation.|
 |icon-placement|`'left' \| 'right'`|`'left'`||
 |theme|`'light' \| 'dark'`|`null`||
 

demo/documentation/components/loadingBar/enUS/index.md

@@ -9,6 +9,11 @@ basic
 #### $NLoadingBar Methods
 |Name|Type|Description|
 |-|-|-|
-|`start`|`() => void`||
+|`start`|`(option: LoadingBarOption) => void`||
-|`finish`|`() => void`||
+|`finish`|`(option: LoadingBarOption) => void`||
-|`error`|`() => void`||
+|`error`|`(option: LoadingBarOption) => void`||
+
+#### LoadingBarOption Type
+|Property|Type|Description|
+|-|-|-|
+|theme|`'light' \| 'dark'`||

demo/documentation/components/loadingBar/zhCN/index.md

@@ -9,6 +9,11 @@ basic
 #### $NLoadingBar Methods
 |名称|类型|说明|
 |-|-|-|
-|`start`|`() => void`||
+|`start`|`(option: LoadingBarOption) => void`||
-|`finish`|`() => void`||
+|`finish`|`(option: LoadingBarOption) => void`||
-|`error`|`() => void`||
+|`error`|`(option: LoadingBarOption) => void`||
+
+#### LoadingBarOption Type
+|属性|类型|说明|
+|-|-|-|
+|theme|`'light' \| 'dark'`||

demo/documentation/components/upload/enUS/basic.md

@@ -1,6 +1,6 @@
 # Basic
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"
     :headers="{

demo/documentation/components/upload/enUS/controlled.md

@@ -1,7 +1,7 @@
 # Controlled File List
 Example is only a joke.
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"
     :file-list="fileList"

demo/documentation/components/upload/enUS/defaultFiles.md

@@ -1,6 +1,6 @@
 # Default File List
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"
     :default-file-list="defaultFileList"

demo/documentation/components/upload/enUS/drag.md

@@ -1,6 +1,6 @@
 # Drag to Upload
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f">
     <n-upload-dragger>
       <div style="margin-bottom: 12px;">

demo/documentation/components/upload/enUS/onFinish.md

@@ -1,7 +1,7 @@
 # Change File on Finish
 You can change file's property when upload finishes.
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload
     :on-finish="handleFinish"
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"

demo/documentation/components/upload/enUS/submitManually.md

@@ -8,7 +8,7 @@ You can use `submit` method to submit in uncontrolled manner. Also you can do it
 >
   Upload File
 </n-button>
-<div style="overflow: hidden">
+<div>
   <n-upload
     @change="handleChange"
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"

demo/documentation/components/upload/zhCN/basic.md

@@ -1,6 +1,6 @@
 # 基础用法
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"
     :headers="{

demo/documentation/components/upload/zhCN/controlled.md

@@ -1,7 +1,7 @@
 # 受控的文件列表
 下面的例子纯属玩笑。
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"
     :file-list="fileList"

demo/documentation/components/upload/zhCN/defaultFiles.md

@@ -1,6 +1,6 @@
 # 默认文件列表
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"
     :default-file-list="defaultFileList"

demo/documentation/components/upload/zhCN/drag.md

@@ -1,6 +1,6 @@
 # 拖拽上传
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f">
     <n-upload-dragger>
       <div style="margin-bottom: 12px;">

demo/documentation/components/upload/zhCN/onFinish.md

@@ -1,7 +1,7 @@
 # 上传完成的回调
 你可以在回调中修改文件的属性。
 ```html
-<div style="overflow: hidden">
+<div>
   <n-upload
     :on-finish="handleFinish"
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"

demo/documentation/components/upload/zhCN/submitManually.md

@@ -8,7 +8,7 @@
 >
   上传文件
 </n-button>
-<div style="overflow: hidden">
+<div>
   <n-upload
     @change="handleChange"
     action="http://www.mocky.io/v2/5e4bafc63100007100d8b70f"

demo/routes/routes.js

@@ -22,6 +22,7 @@ import popover from '../documentation/components/popover'
 import alert from '../documentation/components/alert'
 import datePicker from '../documentation/components/datePicker'
 import inputNumber from '../documentation/components/inputNumber'
+import icon from '../documentation/components/icon'
 import radio from '../documentation/components/radio'
 import form from '../documentation/components/form'
 import tabs from '../documentation/components/tabs'
@@ -84,10 +85,7 @@ export const childRoutes = [
   { path: '/n-nimbus-service-layout', component: nimbusServiceLayoutDemo },
   { path: '/n-layout', component: layout },
   { path: '/n-gradient-text', component: gradientText },
-  {
+  { path: '/n-icon', component: icon },
-    path: '/n-icon',
-    component: () => import('../documentation/components/icon')
-  },
   { path: '/n-checkbox', component: checkbox },
   { path: '/n-button', component: button },
   { path: '/n-switch', component: nswitch },

src/Avatar/src/main.vue

@@ -32,11 +32,10 @@
 <script>
 import withapp from '../../_mixins/withapp'
 import themeable from '../../_mixins/themeable'
-import asthemecontext from '../../_mixins/asthemecontext'
 
 export default {
   name: 'NAvatar',
-  mixins: [withapp, themeable, asthemecontext],
+  mixins: [withapp, themeable],
   props: {
     size: {
       type: [String, Number],

src/BackTop/src/main.vue

@@ -39,7 +39,6 @@
 import getScrollParent from '../../_utils/dom/getScrollParent'
 import withapp from '../../_mixins/withapp'
 import themeable from '../../_mixins/themeable'
-import asthemecontext from '../../_mixins/asthemecontext'
 import NBasePortal from '../../_base/Portal'
 import formatLength from '../../_utils/css/formatLength'
 
@@ -48,7 +47,7 @@ export default {
   components: {
     NBasePortal
   },
-  mixins: [withapp, themeable, asthemecontext],
+  mixins: [withapp, themeable],
   props: {
     right: {
       type: [Number, String],

src/Checkbox/src/Checkbox.vue

@@ -34,7 +34,6 @@
 <script>
 import withapp from '../../_mixins/withapp'
 import themeable from '../../_mixins/themeable'
-import asthemecontext from '../../_mixins/asthemecontext'
 import asformitem from '../../_mixins/asformitem'
 import CheckMark from './CheckMark'
 import LineMark from './LineMark'
@@ -54,7 +53,6 @@ export default {
   mixins: [
     withapp,
     themeable,
-    asthemecontext,
     asformitem(
       {
         change: 'change',

src/Checkbox/src/CheckboxGroup.vue

@@ -1,7 +1,6 @@
 <script>
 import withapp from '../../_mixins/withapp'
 import themeable from '../../_mixins/themeable'
-import asthemecontext from '../../_mixins/asthemecontext'
 import asformitem from '../../_mixins/asformitem'
 
 export default {
@@ -9,7 +8,6 @@ export default {
   mixins: [
     withapp,
     themeable,
-    asthemecontext,
     asformitem()
   ],
   provide () {

src/Element/src/main.vue

@@ -1,12 +1,11 @@
 <script>
 import withapp from '../../_mixins/withapp'
 import themeable from '../../_mixins/themeable'
-import asthemecontext from '../../_mixins/asthemecontext'
 import styleScheme from '../../_utils/naive/styleScheme'
 
 export default {
   name: 'NElement',
-  mixins: [withapp, themeable, asthemecontext],
+  mixins: [withapp, themeable],
   props: {
     as: {
       type: String,

src/LoadingBar/src/LoadingBar.vue

@@ -10,7 +10,7 @@
       v-show="!enter || status === 'starting'"
       class="n-loading-bar-container"
       :class="{
-        [`n-${theme}-theme`]: theme
+        [`n-${syntheticTheme}-theme`]: syntheticTheme
       }"
     >
       <div
@@ -37,10 +37,16 @@ export default {
       status: null,
       finishCallback: null,
       enter: false,
+      inheritedTheme: null,
       theme: null,
       activeAction: null
     }
   },
+  computed: {
+    syntheticTheme () {
+      return this.theme || this.inheritedTheme
+    }
+  },
   methods: {
     handleAfterEnter () {
       this.enter = true

src/LoadingBar/src/LoadingBarPlugin.js

@@ -6,42 +6,45 @@ export default {
   loadingBarInstance: null,
   finishCallback () {
     if (this.loadingBarInstance) {
-      // document.body.removeChild(this.loadingBarInstance.$el)
       this.loadingBarInstance.$el.remove()
       this.loadingBarInstance.$destroy()
       this.loadingBarInstance = null
     }
   },
-  start () {
+  start ({ theme } = { theme: null }) {
     if (!this.loadingBarInstance) {
       this.loadingBarInstance = new this.Vue(NLoadingBar).$mount()
       document.body.appendChild(this.loadingBarInstance.$el)
     }
-    this.loadingBarInstance.theme = this.theme
+    this.loadingBarInstance.inheritedTheme = this.theme
+    this.loadingBarInstance.theme = theme
     this.loadingBarInstance.start()
   },
-  error () {
+  error ({ theme } = { theme: null }) {
     if (!this.loadingBarInstance) {
       this.loadingBarInstance = new this.Vue(NLoadingBar).$mount()
       document.body.appendChild(this.loadingBarInstance.$el)
     }
-    this.loadingBarInstance.theme = this.theme
+    this.loadingBarInstance.inheritedTheme = this.theme
+    this.loadingBarInstance.theme = theme
     this.loadingBarInstance.error(this.finishCallback.bind(this))
   },
-  finish () {
+  finish ({ theme } = { theme: null }) {
     if (!this.loadingBarInstance) {
       this.loadingBarInstance = new this.Vue(NLoadingBar).$mount()
       document.body.appendChild(this.loadingBarInstance.$el)
     }
-    this.loadingBarInstance.theme = this.theme
+    this.loadingBarInstance.inheritedTheme = this.theme
+    this.loadingBarInstance.theme = theme
     this.loadingBarInstance.finish(this.finishCallback.bind(this))
   },
-  update (percent) {
+  update ({ percent, theme } = { theme: null }) {
     if (!this.loadingBarInstance) {
       this.loadingBarInstance = new this.Vue(NLoadingBar).$mount()
       document.body.appendChild(this.loadingBarInstance.$el)
     }
-    this.loadingBarInstance.theme = this.theme
+    this.loadingBarInstance.inheritedTheme = this.theme
+    this.loadingBarInstance.theme = theme
     this.loadingBarInstance.update(percent)
   }
 }

src/Notification/src/Notification.vue

@@ -57,7 +57,6 @@
 
 <script>
 import themeable from '../../_mixins/themeable'
-import asthemecontext from '../../_mixins/asthemecontext'
 import NIcon from '../../Icon'
 import mdClose from '../../_icons/md-close'
 import mdCheckmarkCircle from '../../_icons/md-checkmark-circle'
@@ -76,7 +75,7 @@ export default {
     mdInformationCircle,
     mdCloseCircle
   },
-  mixins: [ themeable, asthemecontext ],
+  mixins: [ themeable ],
   props: {
     closable: {
       type: Boolean,

think.md

@@ -207,7 +207,7 @@ zindex 的问题解决了，虽然很简单，在 static 元素上设定 zindex
 72. <del>Input Group</del>
 73. <del>Dropdown API 修改为 label + value，目前为止 UI 并没有出现过 key，不能只为了它搞特殊，value 可以，key 甚至会另有作用，现在占用实际是个危险的事情</del>
 74. card slot
-75. table fixed computed left right
+75. <del>table fixed computed left right</del>
 76. gradient text 的切换能解决？
 77. <del>Auto Complete Group</del>
 78. <del>select add tag</del>
@@ -217,6 +217,7 @@ zindex 的问题解决了，虽然很简单，在 static 元素上设定 zindex
 82. Form Item 不返回 true 的时候... 错误信息不会消失，这似乎不太合理?
 83. Form Item 应该和 Input Group 也契合良好
 84. Notification 主题切换需要工作良好
+85. Notification 这个东西很特殊...
 
 ```
 Done