From df093103a94fc29d8e7ff843239d4d056ce365b5 Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Wed, 3 Jun 2020 13:46:11 +0800
Subject: [PATCH 1/3] feat($NOs): a os meta property includes theme
---
demo/entry.vue | 6 ++-
demo/routes/routes.js | 2 +-
src/ConfigProvider/index.js | 2 +
src/ConfigProvider/src/installOsProperty.js | 47 +++++++++++++++++++++
4 files changed, 55 insertions(+), 2 deletions(-)
create mode 100644 src/ConfigProvider/src/installOsProperty.js
diff --git a/demo/entry.vue b/demo/entry.vue
index 198b9b72f..5df38e38e 100644
--- a/demo/entry.vue
+++ b/demo/entry.vue
@@ -96,7 +96,11 @@ export default {
},
theme: {
get () {
- return this.$route.params.theme === 'light' ? 'light' : 'dark'
+ switch (this.$route.params.theme) {
+ case 'os-theme': return this.$NOs.theme
+ case 'dark': return 'dark'
+ default: return 'light'
+ }
},
set (theme) {
this.$router.push(changeThemeInPath(this.$route.fullPath, theme))
diff --git a/demo/routes/routes.js b/demo/routes/routes.js
index fe5a59282..b6e0f5117 100644
--- a/demo/routes/routes.js
+++ b/demo/routes/routes.js
@@ -170,6 +170,6 @@ export const routes = [
},
{
path: '/*',
- redirect: '/zh-CN/light'
+ redirect: '/zh-CN/os-theme'
}
]
diff --git a/src/ConfigProvider/index.js b/src/ConfigProvider/index.js
index 504d47da3..a817ffe1d 100644
--- a/src/ConfigProvider/index.js
+++ b/src/ConfigProvider/index.js
@@ -1,9 +1,11 @@
/* istanbul ignore file */
import ConfigProvider from './src/main.vue'
+import installOsProperty from './src/installOsProperty'
ConfigProvider.install = function (Vue) {
Vue.component(ConfigProvider.name, ConfigProvider)
Vue.component('NApp', ConfigProvider)
+ installOsProperty(Vue)
}
export default ConfigProvider
diff --git a/src/ConfigProvider/src/installOsProperty.js b/src/ConfigProvider/src/installOsProperty.js
new file mode 100644
index 000000000..aae152ffb
--- /dev/null
+++ b/src/ConfigProvider/src/installOsProperty.js
@@ -0,0 +1,47 @@
+export default function installOsProperty (Vue) {
+ let osTheme = null
+ // Mql means media query list
+ let darkMql = null
+ let lightMql = null
+ function handleDarkMqlChange (e) {
+ if (e.matches) {
+ os.theme = 'dark'
+ }
+ }
+ function handleLightMqlChange (e) {
+ if (e.matches) {
+ os.theme = 'light'
+ }
+ }
+ if (window.matchMedia) {
+ darkMql = window.matchMedia('(prefers-color-scheme: dark)')
+ lightMql = window.matchMedia('(prefers-color-scheme: light)')
+ if (darkMql.matches) {
+ osTheme = 'dark'
+ } else if (lightMql.matches) {
+ osTheme = 'light'
+ }
+ if (darkMql.addEventListener) {
+ darkMql.addEventListener('change', handleDarkMqlChange)
+ lightMql.addEventListener('change', handleLightMqlChange)
+ } else if (darkMql.addListener) {
+ darkMql.addListener(handleDarkMqlChange)
+ lightMql.addListener(handleLightMqlChange)
+ }
+ }
+ const os = Vue.observable({
+ theme: osTheme
+ })
+ Vue.prototype.$NOs = os
+ return () => {
+ if (window.matchMedia) {
+ if (darkMql.removeEventListener) {
+ darkMql.removeEventListener('change', handleDarkMqlChange)
+ lightMql.removeEventListener('change', handleLightMqlChange)
+ } else if (darkMql.removeListener) {
+ darkMql.removeListener(handleDarkMqlChange)
+ lightMql.removeListener(handleLightMqlChange)
+ }
+ }
+ }
+}
From a457b75e0e1bb838746165c613fb1f2359d4300b Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Wed, 3 Jun 2020 13:56:46 +0800
Subject: [PATCH 2/3] doc(config-provider): use os theme
---
.../components/configProvider/enUS/index.md | 1 +
.../components/configProvider/enUS/osTheme.md | 9 +++++++++
.../components/configProvider/zhCN/index.md | 1 +
.../components/configProvider/zhCN/osTheme.md | 9 +++++++++
4 files changed, 20 insertions(+)
create mode 100644 demo/documentation/components/configProvider/enUS/osTheme.md
create mode 100644 demo/documentation/components/configProvider/zhCN/osTheme.md
diff --git a/demo/documentation/components/configProvider/enUS/index.md b/demo/documentation/components/configProvider/enUS/index.md
index 2dff3253c..601a87d62 100644
--- a/demo/documentation/components/configProvider/enUS/index.md
+++ b/demo/documentation/components/configProvider/enUS/index.md
@@ -6,6 +6,7 @@ theme
namespace
inherit-theme
theme-environment
+os-theme
language
transparent
```
diff --git a/demo/documentation/components/configProvider/enUS/osTheme.md b/demo/documentation/components/configProvider/enUS/osTheme.md
new file mode 100644
index 000000000..8c168c0b0
--- /dev/null
+++ b/demo/documentation/components/configProvider/enUS/osTheme.md
@@ -0,0 +1,9 @@
+# Use OS Theme
+Naive-ui provides `$NOs.theme` property to get the current theme of your OS.
+```html
+
+
+ Your current system theme is {{ JSON.stringify($NOs.theme) }}.
+
+
+```
diff --git a/demo/documentation/components/configProvider/zhCN/index.md b/demo/documentation/components/configProvider/zhCN/index.md
index f8d7d1c41..3fffc61c8 100644
--- a/demo/documentation/components/configProvider/zhCN/index.md
+++ b/demo/documentation/components/configProvider/zhCN/index.md
@@ -6,6 +6,7 @@ theme
namespace
inherit-theme
theme-environment
+os-theme
language
transparent
```
diff --git a/demo/documentation/components/configProvider/zhCN/osTheme.md b/demo/documentation/components/configProvider/zhCN/osTheme.md
new file mode 100644
index 000000000..02c3c7452
--- /dev/null
+++ b/demo/documentation/components/configProvider/zhCN/osTheme.md
@@ -0,0 +1,9 @@
+# 使用操作系统主题
+Naive-ui 提供 `$NOs.theme` 属性来获取当前操作系统的主题。
+```html
+
+
+ 当前操作系统的主题是 {{ JSON.stringify($NOs.theme) }}。
+
+
+```
From 34ad64ea056a67a1b7b3f27920c9ec44fff8a100 Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Wed, 3 Jun 2020 14:00:52 +0800
Subject: [PATCH 3/3] doc(changelog): 1.3.3
---
CHANGELOG.en-US.md | 4 ++++
CHANGELOG.zh-CN.md | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index b3dd475e1..432c5c711 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,4 +1,8 @@
# CHANGELOG
+## 1.3.3 (2020-06-03)
+### Features
+- Add `$NOs.theme` to get the current theme of the OS.
+
## 1.3.2 (2020-06-02)
### Fixes
- Fix the problem that `n-log`'s loading indicator uses monospace font.
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 8ce421d94..c31aace59 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,4 +1,8 @@
# CHANGELOG
+## 1.3.3 (2020-06-03)
+### Features
+- 增加了 `$NOs.theme` 来获取当前操作系统的主题
+
## 1.3.2 (2020-06-02)
### Fixes
- 修正了 `n-log` 的加载器显示等宽字体的问题