@vxrn/color-scheme 1.10.6 → 1.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -28,8 +28,11 @@ __export(systemScheme_native_exports, {
28
28
  module.exports = __toCommonJS(systemScheme_native_exports);
29
29
  var import_react = require("react"),
30
30
  import_react_native = require("react-native");
31
+ function toScheme(colorScheme) {
32
+ return colorScheme === "dark" ? "dark" : "light";
33
+ }
31
34
  function getSystemScheme() {
32
- return import_react_native.Appearance.getColorScheme() || "light";
35
+ return toScheme(import_react_native.Appearance.getColorScheme());
33
36
  }
34
37
  function useSystemScheme() {
35
38
  var [scheme, setScheme] = (0, import_react.useState)(getSystemScheme);
@@ -38,7 +41,7 @@ function useSystemScheme() {
38
41
  var {
39
42
  colorScheme
40
43
  } = param;
41
- setScheme(colorScheme || "light");
44
+ setScheme(toScheme(colorScheme));
42
45
  }),
43
46
  handleAppStateChange = function (nextAppState) {
44
47
  if (nextAppState === "active") {
@@ -1 +1 @@
1
- {"version":3,"names":["systemScheme_native_exports","__export","getSystemScheme","useSystemScheme","module","exports","__toCommonJS","import_react","require","import_react_native","Appearance","getColorScheme","scheme","setScheme","useState","useEffect","appearanceSubscription","addChangeListener","param","colorScheme","handleAppStateChange","nextAppState","currentScheme","prev","appStateSubscription","AppState","addEventListener","remove"],"sources":["../../src/systemScheme.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,2BAAA;AAAAC,QAAA,CAAAD,2BAAA;EAAAE,eAAA,EAAAA,CAAA,KAAAA,eAAA;EAAAC,eAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAN,2BAAA;AAAA,IAAAO,YAAA,GAAoCC,OAAA;EACpCC,mBAAA,GAAqCD,OAAA;AAC9B,SAASN,gBAAA,EAAkB;EAC9B,OAAOO,mBAAA,CAAAC,UAAA,CAAWC,cAAA,CAAe,KAAK;AAC1C;AACO,SAASR,gBAAA,EAAkB;EAC9B,IAAI,CAACS,MAAA,EAAQC,SAAS,QAAIN,YAAA,CAAAO,QAAA,EAASZ,eAAe;EAClD,WAAAK,YAAA,CAAAQ,SAAA,EAAU,YAAW;IAEjB,IAAIC,sBAAA,GAAyBP,mBAAA,CAAAC,UAAA,CAAWO,iBAAA,CAAkB,UAASC,KAAA,EAAO;QACtE,IAAI;UAAEC;QAAY,IAAID,KAAA;QACtBL,SAAA,CAAUM,WAAA,IAAe,OAAO;MACpC,CAAC;MAGGC,oBAAA,GAAuB,SAAAA,CAASC,YAAA,EAAc;QAC9C,IAAIA,YAAA,KAAiB,UAAU;UAC3B,IAAIC,aAAA,GAAgBpB,eAAA,CAAgB;UACpCW,SAAA,CAAU,UAASU,IAAA,EAAM;YACrB,OAAOA,IAAA,KAASD,aAAA,GAAgBA,aAAA,GAAgBC,IAAA;UACpD,CAAC;QACL;MACJ;MACIC,oBAAA,GAAuBf,mBAAA,CAAAgB,QAAA,CAASC,gBAAA,CAAiB,UAAUN,oBAAoB;IACnF,OAAO,YAAW;MACdJ,sBAAA,CAAuBW,MAAA,CAAO,GAC9BH,oBAAA,CAAqBG,MAAA,CAAO;IAChC;EACJ,GAAG,EAAE,GACEf,MAAA;AACX","ignoreList":[]}
1
+ {"version":3,"names":["systemScheme_native_exports","__export","getSystemScheme","useSystemScheme","module","exports","__toCommonJS","import_react","require","import_react_native","toScheme","colorScheme","Appearance","getColorScheme","scheme","setScheme","useState","useEffect","appearanceSubscription","addChangeListener","param","handleAppStateChange","nextAppState","currentScheme","prev","appStateSubscription","AppState","addEventListener","remove"],"sources":["../../src/systemScheme.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,2BAAA;AAAAC,QAAA,CAAAD,2BAAA;EAAAE,eAAA,EAAAA,CAAA,KAAAA,eAAA;EAAAC,eAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAN,2BAAA;AAAA,IAAAO,YAAA,GAAoCC,OAAA;EACpCC,mBAAA,GAAqCD,OAAA;AACrC,SAASE,SAASC,WAAA,EAAa;EAC3B,OAAOA,WAAA,KAAgB,SAAS,SAAS;AAC7C;AACO,SAAST,gBAAA,EAAkB;EAC9B,OAAOQ,QAAA,CAASD,mBAAA,CAAAG,UAAA,CAAWC,cAAA,CAAe,CAAC;AAC/C;AACO,SAASV,gBAAA,EAAkB;EAC9B,IAAI,CAACW,MAAA,EAAQC,SAAS,QAAIR,YAAA,CAAAS,QAAA,EAASd,eAAe;EAClD,WAAAK,YAAA,CAAAU,SAAA,EAAU,YAAW;IAEjB,IAAIC,sBAAA,GAAyBT,mBAAA,CAAAG,UAAA,CAAWO,iBAAA,CAAkB,UAASC,KAAA,EAAO;QACtE,IAAI;UAAET;QAAY,IAAIS,KAAA;QACtBL,SAAA,CAAUL,QAAA,CAASC,WAAW,CAAC;MACnC,CAAC;MAGGU,oBAAA,GAAuB,SAAAA,CAASC,YAAA,EAAc;QAC9C,IAAIA,YAAA,KAAiB,UAAU;UAC3B,IAAIC,aAAA,GAAgBrB,eAAA,CAAgB;UACpCa,SAAA,CAAU,UAASS,IAAA,EAAM;YACrB,OAAOA,IAAA,KAASD,aAAA,GAAgBA,aAAA,GAAgBC,IAAA;UACpD,CAAC;QACL;MACJ;MACIC,oBAAA,GAAuBhB,mBAAA,CAAAiB,QAAA,CAASC,gBAAA,CAAiB,UAAUN,oBAAoB;IACnF,OAAO,YAAW;MACdH,sBAAA,CAAuBU,MAAA,CAAO,GAC9BH,oBAAA,CAAqBG,MAAA,CAAO;IAChC;EACJ,GAAG,EAAE,GACEd,MAAA;AACX","ignoreList":[]}
@@ -42,7 +42,7 @@ function getInitialSetting() {
42
42
  return "system";
43
43
  }
44
44
  function getInitialValue(setting) {
45
- return setting === "system" ? import_react_native.Appearance.getColorScheme() || "light" : setting;
45
+ return setting === "system" ? import_react_native.Appearance.getColorScheme() === "dark" ? "dark" : "light" : setting;
46
46
  }
47
47
  var initialSetting = getInitialSetting(),
48
48
  currentSetting = initialSetting,
@@ -63,7 +63,7 @@ function startWebListener() {
63
63
  }
64
64
  }
65
65
  function resolveValue(setting) {
66
- return setting === "system" ? import_react_native.Appearance.getColorScheme() || "light" : setting;
66
+ return setting === "system" ? import_react_native.Appearance.getColorScheme() === "dark" ? "dark" : "light" : setting;
67
67
  }
68
68
  function updateValueFromSystem() {
69
69
  var value = resolveValue("system");
@@ -73,7 +73,7 @@ function updateValueFromSystem() {
73
73
  }
74
74
  function updateScheme(setting) {
75
75
  var value = setting === "system" ? resolveValue("system") : setting;
76
- (value !== currentValue || currentSetting !== setting) && (currentSetting = setting, currentValue = value, setting !== "system" ? import_react_native.Appearance.setColorScheme(value) : import_react_native.Appearance.setColorScheme(null), listeners.forEach(function (l) {
76
+ (value !== currentValue || currentSetting !== setting) && (currentSetting = setting, currentValue = value, setting !== "system" ? import_react_native.Appearance.setColorScheme(value) : import_react_native.Appearance.setColorScheme("unspecified"), listeners.forEach(function (l) {
77
77
  l(currentSetting, currentValue);
78
78
  }));
79
79
  }
@@ -1 +1 @@
1
- {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","userScheme_exports","__export","getUserScheme","onUserSchemeChange","setUserScheme","useUserScheme","module","exports","import_use_isomorphic_layout_effect","require","import_react","import_react_native","import_systemScheme","listeners","Set","storageKey","getInitialSetting","localStorage","stored","getItem","getInitialValue","setting","Appearance","getColorScheme","initialSetting","currentSetting","currentValue","addChangeListener","next","colorScheme","updateValueFromSystem","isWebListening","startWebListener","_window_matchMedia","_window","_matcher_addEventListener","matcher","window","matchMedia","call","onSystemChange","addEventListener","resolveValue","forEach","l","updateScheme","setColorScheme","setItem","listener","add","delete","state","setState","useState","useIsomorphicLayoutEffect"],"sources":["../../src/userScheme.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","userScheme_exports","__export","getUserScheme","onUserSchemeChange","setUserScheme","useUserScheme","module","exports","import_use_isomorphic_layout_effect","require","import_react","import_react_native","import_systemScheme","listeners","Set","storageKey","getInitialSetting","localStorage","stored","getItem","getInitialValue","setting","Appearance","getColorScheme","initialSetting","currentSetting","currentValue","addChangeListener","next","colorScheme","updateValueFromSystem","isWebListening","startWebListener","_window_matchMedia","_window","_matcher_addEventListener","matcher","window","matchMedia","call","onSystemChange","addEventListener","resolveValue","forEach","l","updateScheme","setColorScheme","setItem","listener","add","delete","state","setState","useState","useIsomorphicLayoutEffect"],"sources":["../../src/userScheme.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1,7 +1,10 @@
1
1
  import { useState, useEffect } from "react";
2
2
  import { Appearance, AppState } from "react-native";
3
+ function toScheme(colorScheme) {
4
+ return colorScheme === "dark" ? "dark" : "light";
5
+ }
3
6
  function getSystemScheme() {
4
- return Appearance.getColorScheme() || "light";
7
+ return toScheme(Appearance.getColorScheme());
5
8
  }
6
9
  function useSystemScheme() {
7
10
  var [scheme, setScheme] = useState(getSystemScheme);
@@ -10,7 +13,7 @@ function useSystemScheme() {
10
13
  var {
11
14
  colorScheme
12
15
  } = param;
13
- setScheme(colorScheme || "light");
16
+ setScheme(toScheme(colorScheme));
14
17
  }),
15
18
  handleAppStateChange = function (nextAppState) {
16
19
  if (nextAppState === "active") {
@@ -1 +1 @@
1
- {"version":3,"names":["useState","useEffect","Appearance","AppState","getSystemScheme","getColorScheme","useSystemScheme","scheme","setScheme","appearanceSubscription","addChangeListener","param","colorScheme","handleAppStateChange","nextAppState","currentScheme","prev","appStateSubscription","addEventListener","remove"],"sources":["../../src/systemScheme.native.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,SAAA,QAAiB;AACpC,SAASC,UAAA,EAAYC,QAAA,QAAgB;AAC9B,SAASC,gBAAA,EAAkB;EAC9B,OAAOF,UAAA,CAAWG,cAAA,CAAe,KAAK;AAC1C;AACO,SAASC,gBAAA,EAAkB;EAC9B,IAAI,CAACC,MAAA,EAAQC,SAAS,IAAIR,QAAA,CAASI,eAAe;EAClD,OAAAH,SAAA,CAAU,YAAW;IAEjB,IAAIQ,sBAAA,GAAyBP,UAAA,CAAWQ,iBAAA,CAAkB,UAASC,KAAA,EAAO;QACtE,IAAI;UAAEC;QAAY,IAAID,KAAA;QACtBH,SAAA,CAAUI,WAAA,IAAe,OAAO;MACpC,CAAC;MAGGC,oBAAA,GAAuB,SAAAA,CAASC,YAAA,EAAc;QAC9C,IAAIA,YAAA,KAAiB,UAAU;UAC3B,IAAIC,aAAA,GAAgBX,eAAA,CAAgB;UACpCI,SAAA,CAAU,UAASQ,IAAA,EAAM;YACrB,OAAOA,IAAA,KAASD,aAAA,GAAgBA,aAAA,GAAgBC,IAAA;UACpD,CAAC;QACL;MACJ;MACIC,oBAAA,GAAuBd,QAAA,CAASe,gBAAA,CAAiB,UAAUL,oBAAoB;IACnF,OAAO,YAAW;MACdJ,sBAAA,CAAuBU,MAAA,CAAO,GAC9BF,oBAAA,CAAqBE,MAAA,CAAO;IAChC;EACJ,GAAG,EAAE,GACEZ,MAAA;AACX","ignoreList":[]}
1
+ {"version":3,"names":["useState","useEffect","Appearance","AppState","toScheme","colorScheme","getSystemScheme","getColorScheme","useSystemScheme","scheme","setScheme","appearanceSubscription","addChangeListener","param","handleAppStateChange","nextAppState","currentScheme","prev","appStateSubscription","addEventListener","remove"],"sources":["../../src/systemScheme.native.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,SAAA,QAAiB;AACpC,SAASC,UAAA,EAAYC,QAAA,QAAgB;AACrC,SAASC,SAASC,WAAA,EAAa;EAC3B,OAAOA,WAAA,KAAgB,SAAS,SAAS;AAC7C;AACO,SAASC,gBAAA,EAAkB;EAC9B,OAAOF,QAAA,CAASF,UAAA,CAAWK,cAAA,CAAe,CAAC;AAC/C;AACO,SAASC,gBAAA,EAAkB;EAC9B,IAAI,CAACC,MAAA,EAAQC,SAAS,IAAIV,QAAA,CAASM,eAAe;EAClD,OAAAL,SAAA,CAAU,YAAW;IAEjB,IAAIU,sBAAA,GAAyBT,UAAA,CAAWU,iBAAA,CAAkB,UAASC,KAAA,EAAO;QACtE,IAAI;UAAER;QAAY,IAAIQ,KAAA;QACtBH,SAAA,CAAUN,QAAA,CAASC,WAAW,CAAC;MACnC,CAAC;MAGGS,oBAAA,GAAuB,SAAAA,CAASC,YAAA,EAAc;QAC9C,IAAIA,YAAA,KAAiB,UAAU;UAC3B,IAAIC,aAAA,GAAgBV,eAAA,CAAgB;UACpCI,SAAA,CAAU,UAASO,IAAA,EAAM;YACrB,OAAOA,IAAA,KAASD,aAAA,GAAgBA,aAAA,GAAgBC,IAAA;UACpD,CAAC;QACL;MACJ;MACIC,oBAAA,GAAuBf,QAAA,CAASgB,gBAAA,CAAiB,UAAUL,oBAAoB;IACnF,OAAO,YAAW;MACdH,sBAAA,CAAuBS,MAAA,CAAO,GAC9BF,oBAAA,CAAqBE,MAAA,CAAO;IAChC;EACJ,GAAG,EAAE,GACEX,MAAA;AACX","ignoreList":[]}
@@ -12,7 +12,7 @@ function getInitialSetting() {
12
12
  return "system";
13
13
  }
14
14
  function getInitialValue(setting) {
15
- return setting === "system" ? Appearance.getColorScheme() || "light" : setting;
15
+ return setting === "system" ? Appearance.getColorScheme() === "dark" ? "dark" : "light" : setting;
16
16
  }
17
17
  var initialSetting = getInitialSetting(),
18
18
  currentSetting = initialSetting,
@@ -33,7 +33,7 @@ function startWebListener() {
33
33
  }
34
34
  }
35
35
  function resolveValue(setting) {
36
- return setting === "system" ? Appearance.getColorScheme() || "light" : setting;
36
+ return setting === "system" ? Appearance.getColorScheme() === "dark" ? "dark" : "light" : setting;
37
37
  }
38
38
  function updateValueFromSystem() {
39
39
  var value = resolveValue("system");
@@ -43,7 +43,7 @@ function updateValueFromSystem() {
43
43
  }
44
44
  function updateScheme(setting) {
45
45
  var value = setting === "system" ? resolveValue("system") : setting;
46
- (value !== currentValue || currentSetting !== setting) && (currentSetting = setting, currentValue = value, setting !== "system" ? Appearance.setColorScheme(value) : Appearance.setColorScheme(null), listeners.forEach(function (l) {
46
+ (value !== currentValue || currentSetting !== setting) && (currentSetting = setting, currentValue = value, setting !== "system" ? Appearance.setColorScheme(value) : Appearance.setColorScheme("unspecified"), listeners.forEach(function (l) {
47
47
  l(currentSetting, currentValue);
48
48
  }));
49
49
  }
@@ -1 +1 @@
1
- {"version":3,"names":["useIsomorphicLayoutEffect","useState","useMemo","Appearance","getSystemScheme","listeners","Set","storageKey","getInitialSetting","localStorage","stored","getItem","getInitialValue","setting","getColorScheme","initialSetting","currentSetting","currentValue","addChangeListener","next","colorScheme","updateValueFromSystem","isWebListening","startWebListener","_window_matchMedia","_window","_matcher_addEventListener","matcher","window","matchMedia","call","onSystemChange","addEventListener","resolveValue","value","forEach","l","updateScheme","setColorScheme","setUserScheme","setItem","getUserScheme","onUserSchemeChange","listener","add","delete","useUserScheme","state","setState"],"sources":["../../src/userScheme.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["useIsomorphicLayoutEffect","useState","useMemo","Appearance","getSystemScheme","listeners","Set","storageKey","getInitialSetting","localStorage","stored","getItem","getInitialValue","setting","getColorScheme","initialSetting","currentSetting","currentValue","addChangeListener","next","colorScheme","updateValueFromSystem","isWebListening","startWebListener","_window_matchMedia","_window","_matcher_addEventListener","matcher","window","matchMedia","call","onSystemChange","addEventListener","resolveValue","value","forEach","l","updateScheme","setColorScheme","setUserScheme","setItem","getUserScheme","onUserSchemeChange","listener","add","delete","useUserScheme","state","setState"],"sources":["../../src/userScheme.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vxrn/color-scheme",
3
- "version": "1.10.6",
3
+ "version": "1.11.0",
4
4
  "sideEffects": false,
5
5
  "exports": {
6
6
  "./package.json": "./package.json",
@@ -33,12 +33,12 @@
33
33
  "watch": "tamagui-build --watch"
34
34
  },
35
35
  "dependencies": {
36
- "@vxrn/use-isomorphic-layout-effect": "1.10.6"
36
+ "@vxrn/use-isomorphic-layout-effect": "1.11.0"
37
37
  },
38
38
  "devDependencies": {
39
39
  "@tamagui/build": "2.0.0-rc.22",
40
- "react": "19.1.0",
41
- "react-native": "0.81.5"
40
+ "react": "19.2.0",
41
+ "react-native": "0.83.2"
42
42
  },
43
43
  "peerDependencies": {
44
44
  "react": "*",
@@ -3,8 +3,12 @@ import { Appearance, AppState, type AppStateStatus } from 'react-native'
3
3
 
4
4
  export type Scheme = 'light' | 'dark'
5
5
 
6
+ function toScheme(colorScheme: string | null | undefined): Scheme {
7
+ return colorScheme === 'dark' ? 'dark' : 'light'
8
+ }
9
+
6
10
  export function getSystemScheme(): Scheme {
7
- return Appearance.getColorScheme() || 'light'
11
+ return toScheme(Appearance.getColorScheme())
8
12
  }
9
13
 
10
14
  export function useSystemScheme(): Scheme {
@@ -13,7 +17,7 @@ export function useSystemScheme(): Scheme {
13
17
  useEffect(() => {
14
18
  // Listen for appearance changes while app is active
15
19
  const appearanceSubscription = Appearance.addChangeListener(({ colorScheme }) => {
16
- setScheme(colorScheme || 'light')
20
+ setScheme(toScheme(colorScheme))
17
21
  })
18
22
 
19
23
  // Also check when app comes back to foreground, as appearance change
package/src/userScheme.ts CHANGED
@@ -36,7 +36,7 @@ function getInitialSetting(): SchemeSetting {
36
36
  function getInitialValue(setting: SchemeSetting): Scheme {
37
37
  if (process.env.TAMAGUI_TARGET === 'native') {
38
38
  if (setting === 'system') {
39
- return Appearance.getColorScheme() || 'light'
39
+ return Appearance.getColorScheme() === 'dark' ? 'dark' : 'light'
40
40
  }
41
41
  return setting
42
42
  }
@@ -80,7 +80,7 @@ function startWebListener() {
80
80
  function resolveValue(setting: SchemeSetting): Scheme {
81
81
  if (setting === 'system') {
82
82
  if (process.env.TAMAGUI_TARGET === 'native') {
83
- return Appearance.getColorScheme() || 'light'
83
+ return Appearance.getColorScheme() === 'dark' ? 'dark' : 'light'
84
84
  }
85
85
  return getSystemScheme()
86
86
  }
@@ -113,7 +113,7 @@ function updateScheme(setting: SchemeSetting) {
113
113
  Appearance.setColorScheme(value)
114
114
  } else {
115
115
  // reset to null to re-enable system tracking
116
- Appearance.setColorScheme(null)
116
+ Appearance.setColorScheme('unspecified')
117
117
  }
118
118
  }
119
119
 
@@ -1 +1 @@
1
- {"version":3,"file":"systemScheme.native.d.ts","sourceRoot":"","sources":["../src/systemScheme.native.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,MAAM,CAAA;AAErC,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,eAAe,IAAI,MAAM,CA2BxC"}
1
+ {"version":3,"file":"systemScheme.native.d.ts","sourceRoot":"","sources":["../src/systemScheme.native.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,MAAM,CAAA;AAMrC,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,eAAe,IAAI,MAAM,CA2BxC"}