@tamagui/theme 1.23.0 → 1.23.1

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.
@@ -47,13 +47,13 @@ function _mutateTheme(props) {
47
47
  return { theme: theme2 };
48
48
  }
49
49
  }
50
- for (const key in themeIn) {
51
- (0, import_web.ensureThemeVariable)(themeIn, key);
52
- }
53
50
  const theme = {
54
51
  ...mutationType === "update" ? config.themes[themeName] ?? {} : {},
55
52
  ...themeIn
56
53
  };
54
+ for (const key in theme) {
55
+ (0, import_web.ensureThemeVariable)(theme, key);
56
+ }
57
57
  const themeProxied = (0, import_web.proxyThemeToParents)(themeName, theme, config.themes);
58
58
  config.themes[themeName] = themeProxied;
59
59
  let cssRules = [];
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/_mutateTheme.ts"],
4
- "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAyB;AAEzB,iBAOO;AAEA,SAAS,aAAa,OAK1B;AAhBH;AAiBE,MAAI,2BAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,aAAS,sBAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,aAAW,OAAO,SAAS;AACzB,wCAAoB,SAAS,GAAG;AAAA,EAClC;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,QAAM,mBAAe,gCAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,+BAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,qBAAW,6BAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,uBAAS,kBAAT,mBAAwB,YAAY;AAAA,MACtC;AAAA,IACF;AAAA,EACF;AAEA,iCAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
4
+ "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAyB;AAEzB,iBAOO;AAEA,SAAS,aAAa,OAK1B;AAhBH;AAiBE,MAAI,2BAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,aAAS,sBAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,aAAW,OAAO,OAAO;AACvB,wCAAoB,OAAO,GAAG;AAAA,EAChC;AAEA,QAAM,mBAAe,gCAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,+BAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,qBAAW,6BAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,uBAAS,kBAAT,mBAAwB,YAAY;AAAA,MACtC;AAAA,IACF;AAAA,EACF;AAEA,iCAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
5
5
  "names": ["theme"]
6
6
  }
@@ -31,13 +31,13 @@ function _mutateTheme(props) {
31
31
  return { theme: theme2 };
32
32
  }
33
33
  }
34
- for (const key in themeIn) {
35
- ensureThemeVariable(themeIn, key);
36
- }
37
34
  const theme = {
38
35
  ...mutationType === "update" ? config.themes[themeName] ?? {} : {},
39
36
  ...themeIn
40
37
  };
38
+ for (const key in theme) {
39
+ ensureThemeVariable(theme, key);
40
+ }
41
41
  const themeProxied = proxyThemeToParents(themeName, theme, config.themes);
42
42
  config.themes[themeName] = themeProxied;
43
43
  let cssRules = [];
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/_mutateTheme.ts"],
4
- "mappings": "AAAA,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,SAAS,aAAa,OAK1B;AAhBH;AAiBE,MAAI,UAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,SAAS,UAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,aAAW,OAAO,SAAS;AACzB,wBAAoB,SAAS,GAAG;AAAA,EAClC;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,QAAM,eAAe,oBAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,eAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,iBAAW,iBAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,uBAAS,kBAAT,mBAAwB,YAAY;AAAA,MACtC;AAAA,IACF;AAAA,EACF;AAEA,sBAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
4
+ "mappings": "AAAA,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,SAAS,aAAa,OAK1B;AAhBH;AAiBE,MAAI,UAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,SAAS,UAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,aAAW,OAAO,OAAO;AACvB,wBAAoB,OAAO,GAAG;AAAA,EAChC;AAEA,QAAM,eAAe,oBAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,eAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,iBAAW,iBAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,uBAAS,kBAAT,mBAAwB,YAAY;AAAA,MACtC;AAAA,IACF;AAAA,EACF;AAEA,sBAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
5
5
  "names": ["theme"]
6
6
  }
@@ -31,13 +31,13 @@ function _mutateTheme(props) {
31
31
  return { theme: theme2 };
32
32
  }
33
33
  }
34
- for (const key in themeIn) {
35
- ensureThemeVariable(themeIn, key);
36
- }
37
34
  const theme = {
38
35
  ...mutationType === "update" ? config.themes[themeName] ?? {} : {},
39
36
  ...themeIn
40
37
  };
38
+ for (const key in theme) {
39
+ ensureThemeVariable(theme, key);
40
+ }
41
41
  const themeProxied = proxyThemeToParents(themeName, theme, config.themes);
42
42
  config.themes[themeName] = themeProxied;
43
43
  let cssRules = [];
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/_mutateTheme.ts"],
4
- "mappings": "AAAA,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,SAAS,aAAa,OAK1B;AAhBH;AAiBE,MAAI,UAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,SAAS,UAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,aAAW,OAAO,SAAS;AACzB,wBAAoB,SAAS,GAAG;AAAA,EAClC;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,QAAM,eAAe,oBAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,eAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,iBAAW,iBAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,uBAAS,kBAAT,mBAAwB,YAAY;AAAA,MACtC;AAAA,IACF;AAAA,EACF;AAEA,sBAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
4
+ "mappings": "AAAA,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,SAAS,aAAa,OAK1B;AAhBH;AAiBE,MAAI,UAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,SAAS,UAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,aAAW,OAAO,OAAO;AACvB,wBAAoB,OAAO,GAAG;AAAA,EAChC;AAEA,QAAM,eAAe,oBAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,eAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,iBAAW,iBAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,uBAAS,kBAAT,mBAAwB,YAAY;AAAA,MACtC;AAAA,IACF;AAAA,EACF;AAEA,sBAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
5
5
  "names": ["theme"]
6
6
  }
@@ -30,13 +30,13 @@ function _mutateTheme(props) {
30
30
  return { theme: theme2 };
31
31
  }
32
32
  }
33
- for (const key in themeIn) {
34
- ensureThemeVariable(themeIn, key);
35
- }
36
33
  const theme = {
37
34
  ...mutationType === "update" ? config.themes[themeName] ?? {} : {},
38
35
  ...themeIn
39
36
  };
37
+ for (const key in theme) {
38
+ ensureThemeVariable(theme, key);
39
+ }
40
40
  const themeProxied = proxyThemeToParents(themeName, theme, config.themes);
41
41
  config.themes[themeName] = themeProxied;
42
42
  let cssRules = [];
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/_mutateTheme.ts"],
4
- "mappings": "AAAA,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,SAAS,aAAa,OAK1B;AACD,MAAI,UAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,SAAS,UAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,aAAW,OAAO,SAAS;AACzB,wBAAoB,SAAS,GAAG;AAAA,EAClC;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,QAAM,eAAe,oBAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,eAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,iBAAW,iBAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,iBAAS,eAAe,YAAY,QAAQ;AAAA,MAC9C;AAAA,IACF;AAAA,EACF;AAEA,sBAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
4
+ "mappings": "AAAA,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,SAAS,aAAa,OAK1B;AACD,MAAI,UAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,SAAS,UAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,aAAW,OAAO,OAAO;AACvB,wBAAoB,OAAO,GAAG;AAAA,EAChC;AAEA,QAAM,eAAe,oBAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,eAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,iBAAW,iBAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,iBAAS,eAAe,YAAY,QAAQ;AAAA,MAC9C;AAAA,IACF;AAAA,EACF;AAEA,sBAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
5
5
  "names": ["theme"]
6
6
  }
@@ -30,13 +30,13 @@ function _mutateTheme(props) {
30
30
  return { theme: theme2 };
31
31
  }
32
32
  }
33
- for (const key in themeIn) {
34
- ensureThemeVariable(themeIn, key);
35
- }
36
33
  const theme = {
37
34
  ...mutationType === "update" ? config.themes[themeName] ?? {} : {},
38
35
  ...themeIn
39
36
  };
37
+ for (const key in theme) {
38
+ ensureThemeVariable(theme, key);
39
+ }
40
40
  const themeProxied = proxyThemeToParents(themeName, theme, config.themes);
41
41
  config.themes[themeName] = themeProxied;
42
42
  let cssRules = [];
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/_mutateTheme.ts"],
4
- "mappings": "AAAA,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,SAAS,aAAa,OAK1B;AACD,MAAI,UAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,SAAS,UAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,aAAW,OAAO,SAAS;AACzB,wBAAoB,SAAS,GAAG;AAAA,EAClC;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,QAAM,eAAe,oBAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,eAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,iBAAW,iBAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,iBAAS,eAAe,YAAY,QAAQ;AAAA,MAC9C;AAAA,IACF;AAAA,EACF;AAEA,sBAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
4
+ "mappings": "AAAA,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,SAAS,aAAa,OAK1B;AACD,MAAI,UAAU;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,gDAAgD;AAAA,IAC/D;AACA;AAAA,EACF;AACA,QAAM,SAAS,UAAU;AACzB,QAAM,EAAE,MAAM,WAAW,OAAO,SAAS,WAAW,aAAa,IAAI;AAErE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,WAAW;AAAA,IAC7B;AACA,UAAMA,SAAQ,OAAO,OAAO,MAAM,IAAI;AACtC,QAAI,gBAAgB,CAACA,QAAO;AAC1B,YAAM,IAAI;AAAA,QACR,GAAG,iBAAiB,YAAY,YAAY,gCAC1C,MAAM;AAAA,MAEV;AAAA,IACF;AACA,QAAI,CAAC,MAAM,gBAAgBA,QAAO;AAChC,aAAO,EAAE,OAAAA,OAAM;AAAA,IACjB;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,iBAAiB,WAAW,OAAO,OAAO,SAAS,KAAK,CAAC,IAAI,CAAC;AAAA,IAClE,GAAG;AAAA,EACL;AAEA,aAAW,OAAO,OAAO;AACvB,wBAAoB,OAAO,GAAG;AAAA,EAChC;AAEA,QAAM,eAAe,oBAAoB,WAAW,OAAO,OAAO,MAAM;AACxE,SAAO,OAAO,SAAS,IAAI;AAE3B,MAAI,WAAqB,CAAC;AAE1B,eAAa,UAAU,EAAE,GAAG,OAAO,QAAQ,CAAC,SAAS,GAAG,aAAa,CAAC;AAEtE,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,WAAW;AACb,iBAAW,iBAAiB;AAAA;AAAA,QAE1B;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,QACjB;AAAA,MACF,CAAC;AACD,YAAM,KAAK,iBAAiB;AAC5B,YAAM,WAAW,SAAS,cAAc,IAAI,IAAI;AAChD,YAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,YAAM,KAAK;AACX,YAAM,YAAY,SAAS,eAAe,SAAS,KAAK,IAAI,CAAC,CAAC;AAC9D,eAAS,KAAK,YAAY,KAAK;AAC/B,UAAI,UAAU;AACZ,iBAAS,eAAe,YAAY,QAAQ;AAAA,MAC9C;AAAA,IACF;AAAA,EACF;AAEA,sBAAoB,QAAQ,CAAC,YAAY;AACvC,QAAI,QAAQ,MAAM,SAAS,MAAM,MAAM;AACrC,cAAQ;AAAA,QACN;AAAA,UACE,MAAM,MAAM;AAAA,UACZ,YAAY;AAAA,QACd;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO;AAAA,IACL,OAAO;AAAA,IACP;AAAA,EACF;AACF;",
5
5
  "names": ["theme"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/theme",
3
- "version": "1.23.0",
3
+ "version": "1.23.1",
4
4
  "sideEffects": false,
5
5
  "source": "src/index.ts",
6
6
  "types": "./types/index.d.ts",
@@ -17,14 +17,14 @@
17
17
  "watch": "tamagui-build --watch"
18
18
  },
19
19
  "dependencies": {
20
- "@tamagui/constants": "1.23.0",
21
- "@tamagui/web": "1.23.0"
20
+ "@tamagui/constants": "1.23.1",
21
+ "@tamagui/web": "1.23.1"
22
22
  },
23
23
  "peerDependencies": {
24
24
  "react": "*"
25
25
  },
26
26
  "devDependencies": {
27
- "@tamagui/build": "1.23.0",
27
+ "@tamagui/build": "1.23.1",
28
28
  "react": "^18.2.0"
29
29
  },
30
30
  "publishConfig": {
@@ -41,15 +41,15 @@ export function _mutateTheme(props: {
41
41
  }
42
42
  }
43
43
 
44
- for (const key in themeIn) {
45
- ensureThemeVariable(themeIn, key)
46
- }
47
-
48
44
  const theme = {
49
45
  ...(mutationType === 'update' ? config.themes[themeName] ?? {} : {}),
50
46
  ...themeIn,
51
47
  } as ThemeParsed
52
48
 
49
+ for (const key in theme) {
50
+ ensureThemeVariable(theme, key)
51
+ }
52
+
53
53
  const themeProxied = proxyThemeToParents(themeName, theme, config.themes)
54
54
  config.themes[themeName] = themeProxied
55
55