@oxyhq/bloom 0.6.18 → 0.6.19

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.
@@ -32,14 +32,28 @@ function BloomColorScope({
32
32
  };
33
33
  }, [colorPreset, resolvedMode, parent]);
34
34
  const varsStyle = (0, _react.useMemo)(() => (0, _styleBuilder.buildNativePresetStyle)(colorPreset, resolvedMode), [colorPreset, resolvedMode]);
35
- return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BloomThemeProvider.BloomThemeContext.Provider, {
36
- value: contextValue,
37
- children: asChild ? children : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
35
+ let content;
36
+ if (asChild) {
37
+ const child = _react.Children.only(children);
38
+ if (! /*#__PURE__*/(0, _react.isValidElement)(child)) {
39
+ throw new Error('BloomColorScope with `asChild` requires a single React element child that accepts a `style` prop.');
40
+ }
41
+ const childStyle = child.props.style;
42
+ const mergedStyle = [varsStyle, style, childStyle];
43
+ content = /*#__PURE__*/(0, _react.cloneElement)(child, {
44
+ style: mergedStyle
45
+ });
46
+ } else {
47
+ content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
38
48
  style: [{
39
49
  flex: 1
40
50
  }, varsStyle, style],
41
51
  children: children
42
- })
52
+ });
53
+ }
54
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BloomThemeProvider.BloomThemeContext.Provider, {
55
+ value: contextValue,
56
+ children: content
43
57
  });
44
58
  }
45
59
 
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_BloomThemeProvider","_buildTheme","_styleBuilder","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BloomColorScope","colorPreset","asChild","style","children","parent","useContext","BloomThemeContext","Error","resolvedMode","theme","mode","contextValue","useMemo","buildTheme","varsStyle","buildNativePresetStyle","jsx","Provider","value","View","flex","useColorScopeStyle"],"sourceRoot":"../../../../src","sources":["theme/color-scope/index.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_BloomThemeProvider","_buildTheme","_styleBuilder","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BloomColorScope","colorPreset","asChild","style","children","parent","useContext","BloomThemeContext","Error","resolvedMode","theme","mode","contextValue","useMemo","buildTheme","varsStyle","buildNativePresetStyle","content","child","Children","only","isValidElement","childStyle","props","mergedStyle","cloneElement","jsx","View","flex","Provider","value","useColorScopeStyle"],"sourceRoot":"../../../../src","sources":["theme/color-scope/index.tsx"],"mappings":"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","ignoreList":[]}
@@ -30,16 +30,35 @@ function BloomColorScope({
30
30
  colorPreset
31
31
  };
32
32
  }, [colorPreset, resolvedMode, parent]);
33
- const varsStyle = (0, _react.useMemo)(() => ({
34
- ...(0, _styleBuilder.buildScopeVars)(colorPreset, resolvedMode),
35
- ...style
36
- }), [colorPreset, resolvedMode, style]);
33
+ const varsStyle = (0, _react.useMemo)(() => (0, _styleBuilder.buildScopeVars)(colorPreset, resolvedMode), [colorPreset, resolvedMode]);
34
+ let content;
35
+ if (asChild) {
36
+ const child = _react.Children.only(children);
37
+ if (! /*#__PURE__*/(0, _react.isValidElement)(child)) {
38
+ throw new Error('BloomColorScope with `asChild` requires a single React element child that accepts a `style` prop.');
39
+ }
40
+ const childStyle = child.props.style;
41
+ const mergedStyle = {
42
+ ...varsStyle,
43
+ ...style,
44
+ ...childStyle
45
+ };
46
+ content = /*#__PURE__*/(0, _react.cloneElement)(child, {
47
+ style: mergedStyle
48
+ });
49
+ } else {
50
+ const mergedStyle = {
51
+ ...varsStyle,
52
+ ...style
53
+ };
54
+ content = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
55
+ style: mergedStyle,
56
+ children: children
57
+ });
58
+ }
37
59
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BloomThemeProvider.BloomThemeContext.Provider, {
38
60
  value: contextValue,
39
- children: asChild ? children : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
40
- style: varsStyle,
41
- children: children
42
- })
61
+ children: content
43
62
  });
44
63
  }
45
64
 
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireWildcard","require","_BloomThemeProvider","_buildTheme","_styleBuilder","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BloomColorScope","colorPreset","asChild","style","children","parent","useContext","BloomThemeContext","Error","resolvedMode","theme","mode","contextValue","useMemo","buildTheme","varsStyle","buildScopeVars","jsx","Provider","value","useColorScopeStyle"],"sourceRoot":"../../../../src","sources":["theme/color-scope/index.web.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_react","_interopRequireWildcard","require","_BloomThemeProvider","_buildTheme","_styleBuilder","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BloomColorScope","colorPreset","asChild","style","children","parent","useContext","BloomThemeContext","Error","resolvedMode","theme","mode","contextValue","useMemo","buildTheme","varsStyle","buildScopeVars","content","child","Children","only","isValidElement","childStyle","props","mergedStyle","cloneElement","jsx","Provider","value","useColorScopeStyle"],"sourceRoot":"../../../../src","sources":["theme/color-scope/index.web.tsx"],"mappings":"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","ignoreList":[]}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- import React, { useContext, useMemo } from 'react';
3
+ import React, { Children, cloneElement, isValidElement, useContext, useMemo } from 'react';
4
4
  import { View } from 'react-native';
5
5
  import { BloomThemeContext } from "../BloomThemeProvider.js";
6
6
  import { buildTheme } from "../build-theme.js";
@@ -26,14 +26,28 @@ export function BloomColorScope({
26
26
  };
27
27
  }, [colorPreset, resolvedMode, parent]);
28
28
  const varsStyle = useMemo(() => buildNativePresetStyle(colorPreset, resolvedMode), [colorPreset, resolvedMode]);
29
- return /*#__PURE__*/_jsx(BloomThemeContext.Provider, {
30
- value: contextValue,
31
- children: asChild ? children : /*#__PURE__*/_jsx(View, {
29
+ let content;
30
+ if (asChild) {
31
+ const child = Children.only(children);
32
+ if (! /*#__PURE__*/isValidElement(child)) {
33
+ throw new Error('BloomColorScope with `asChild` requires a single React element child that accepts a `style` prop.');
34
+ }
35
+ const childStyle = child.props.style;
36
+ const mergedStyle = [varsStyle, style, childStyle];
37
+ content = /*#__PURE__*/cloneElement(child, {
38
+ style: mergedStyle
39
+ });
40
+ } else {
41
+ content = /*#__PURE__*/_jsx(View, {
32
42
  style: [{
33
43
  flex: 1
34
44
  }, varsStyle, style],
35
45
  children: children
36
- })
46
+ });
47
+ }
48
+ return /*#__PURE__*/_jsx(BloomThemeContext.Provider, {
49
+ value: contextValue,
50
+ children: content
37
51
  });
38
52
  }
39
53
 
@@ -1 +1 @@
1
- {"version":3,"names":["React","useContext","useMemo","View","BloomThemeContext","buildTheme","buildNativePresetStyle","jsx","_jsx","BloomColorScope","colorPreset","asChild","style","children","parent","Error","resolvedMode","theme","mode","contextValue","varsStyle","Provider","value","flex","useColorScopeStyle"],"sourceRoot":"../../../../src","sources":["theme/color-scope/index.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAClD,SAASC,IAAI,QAAwC,cAAc;AAEnE,SAASC,iBAAiB,QAAqC,0BAAuB;AACtF,SAASC,UAAU,QAAQ,mBAAgB;AAE3C,SAASC,sBAAsB,QAAQ,oBAAiB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAezD,OAAO,SAASC,eAAeA,CAAC;EAC9BC,WAAW;EACXC,OAAO,GAAG,KAAK;EACfC,KAAK;EACLC;AACoB,CAAC,EAAE;EACvB,MAAMC,MAAM,GAAGb,UAAU,CAACG,iBAAiB,CAAC;EAC5C,IAAI,CAACU,MAAM,EAAE;IACX,MAAM,IAAIC,KAAK,CAAC,4DAA4D,CAAC;EAC/E;EAEA,MAAMC,YAAY,GAAGF,MAAM,CAACG,KAAK,CAACC,IAAI;EAEtC,MAAMC,YAAY,GAAGjB,OAAO,CAAyB,MAAM;IACzD,MAAMe,KAAK,GAAGZ,UAAU,CAACK,WAAW,EAAEM,YAAY,CAAC;IACnD,OAAO;MAAE,GAAGF,MAAM;MAAEG,KAAK;MAAEP;IAAY,CAAC;EAC1C,CAAC,EAAE,CAACA,WAAW,EAAEM,YAAY,EAAEF,MAAM,CAAC,CAAC;EAEvC,MAAMM,SAAS,GAAGlB,OAAO,CACvB,MAAMI,sBAAsB,CAACI,WAAW,EAAEM,YAAY,CAAC,EACvD,CAACN,WAAW,EAAEM,YAAY,CAC5B,CAAC;EAED,oBACER,IAAA,CAACJ,iBAAiB,CAACiB,QAAQ;IAACC,KAAK,EAAEH,YAAa;IAAAN,QAAA,EAC7CF,OAAO,GAAGE,QAAQ,gBAAGL,IAAA,CAACL,IAAI;MAACS,KAAK,EAAE,CAAC;QAAEW,IAAI,EAAE;MAAE,CAAC,EAAEH,SAAS,EAAER,KAAK,CAAE;MAAAC,QAAA,EAAEA;IAAQ,CAAO;EAAC,CAC3D,CAAC;AAEjC;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASW,kBAAkBA,CAACd,WAAyB,EAAwB;EAClF,MAAMI,MAAM,GAAGb,UAAU,CAACG,iBAAiB,CAAC;EAC5C,IAAI,CAACU,MAAM,EAAE;IACX,MAAM,IAAIC,KAAK,CAAC,+DAA+D,CAAC;EAClF;EACA,MAAMC,YAAY,GAAGF,MAAM,CAACG,KAAK,CAACC,IAAI;EACtC,OAAOhB,OAAO,CACZ,MAAMI,sBAAsB,CAACI,WAAW,EAAEM,YAAY,CAAC,EACvD,CAACN,WAAW,EAAEM,YAAY,CAC5B,CAAC;AACH","ignoreList":[]}
1
+ {"version":3,"names":["React","Children","cloneElement","isValidElement","useContext","useMemo","View","BloomThemeContext","buildTheme","buildNativePresetStyle","jsx","_jsx","BloomColorScope","colorPreset","asChild","style","children","parent","Error","resolvedMode","theme","mode","contextValue","varsStyle","content","child","only","childStyle","props","mergedStyle","flex","Provider","value","useColorScopeStyle"],"sourceRoot":"../../../../src","sources":["theme/color-scope/index.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,QAAQ,EAAEC,YAAY,EAAEC,cAAc,EAAEC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAC1F,SAASC,IAAI,QAAwC,cAAc;AAEnE,SAASC,iBAAiB,QAAqC,0BAAuB;AACtF,SAASC,UAAU,QAAQ,mBAAgB;AAE3C,SAASC,sBAAsB,QAAQ,oBAAiB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAmBzD,OAAO,SAASC,eAAeA,CAAC;EAC9BC,WAAW;EACXC,OAAO,GAAG,KAAK;EACfC,KAAK;EACLC;AACoB,CAAC,EAAE;EACvB,MAAMC,MAAM,GAAGb,UAAU,CAACG,iBAAiB,CAAC;EAC5C,IAAI,CAACU,MAAM,EAAE;IACX,MAAM,IAAIC,KAAK,CAAC,4DAA4D,CAAC;EAC/E;EAEA,MAAMC,YAAY,GAAGF,MAAM,CAACG,KAAK,CAACC,IAAI;EAEtC,MAAMC,YAAY,GAAGjB,OAAO,CAAyB,MAAM;IACzD,MAAMe,KAAK,GAAGZ,UAAU,CAACK,WAAW,EAAEM,YAAY,CAAC;IACnD,OAAO;MAAE,GAAGF,MAAM;MAAEG,KAAK;MAAEP;IAAY,CAAC;EAC1C,CAAC,EAAE,CAACA,WAAW,EAAEM,YAAY,EAAEF,MAAM,CAAC,CAAC;EAEvC,MAAMM,SAAS,GAAGlB,OAAO,CACvB,MAAMI,sBAAsB,CAACI,WAAW,EAAEM,YAAY,CAAC,EACvD,CAACN,WAAW,EAAEM,YAAY,CAC5B,CAAC;EAED,IAAIK,OAAwB;EAC5B,IAAIV,OAAO,EAAE;IACX,MAAMW,KAAK,GAAGxB,QAAQ,CAACyB,IAAI,CAACV,QAAQ,CAAC;IACrC,IAAI,eAACb,cAAc,CAAiBsB,KAAK,CAAC,EAAE;MAC1C,MAAM,IAAIP,KAAK,CACb,mGACF,CAAC;IACH;IACA,MAAMS,UAAU,GAAGF,KAAK,CAACG,KAAK,CAACb,KAAK;IACpC,MAAMc,WAAiC,GAAG,CAACN,SAAS,EAAER,KAAK,EAAEY,UAAU,CAAC;IACxEH,OAAO,gBAAGtB,YAAY,CAACuB,KAAK,EAAE;MAAEV,KAAK,EAAEc;IAAY,CAAC,CAAC;EACvD,CAAC,MAAM;IACLL,OAAO,gBAAGb,IAAA,CAACL,IAAI;MAACS,KAAK,EAAE,CAAC;QAAEe,IAAI,EAAE;MAAE,CAAC,EAAEP,SAAS,EAAER,KAAK,CAAE;MAAAC,QAAA,EAAEA;IAAQ,CAAO,CAAC;EAC3E;EAEA,oBAAOL,IAAA,CAACJ,iBAAiB,CAACwB,QAAQ;IAACC,KAAK,EAAEV,YAAa;IAAAN,QAAA,EAAEQ;EAAO,CAA6B,CAAC;AAChG;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,kBAAkBA,CAACpB,WAAyB,EAAwB;EAClF,MAAMI,MAAM,GAAGb,UAAU,CAACG,iBAAiB,CAAC;EAC5C,IAAI,CAACU,MAAM,EAAE;IACX,MAAM,IAAIC,KAAK,CAAC,+DAA+D,CAAC;EAClF;EACA,MAAMC,YAAY,GAAGF,MAAM,CAACG,KAAK,CAACC,IAAI;EACtC,OAAOhB,OAAO,CACZ,MAAMI,sBAAsB,CAACI,WAAW,EAAEM,YAAY,CAAC,EACvD,CAACN,WAAW,EAAEM,YAAY,CAC5B,CAAC;AACH","ignoreList":[]}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- import React, { useContext, useMemo } from 'react';
3
+ import React, { Children, cloneElement, isValidElement, useContext, useMemo } from 'react';
4
4
  import { BloomThemeContext } from "../BloomThemeProvider.js";
5
5
  import { buildTheme } from "../build-theme.js";
6
6
  import { buildScopeVars } from "./style-builder.js";
@@ -24,16 +24,35 @@ export function BloomColorScope({
24
24
  colorPreset
25
25
  };
26
26
  }, [colorPreset, resolvedMode, parent]);
27
- const varsStyle = useMemo(() => ({
28
- ...buildScopeVars(colorPreset, resolvedMode),
29
- ...style
30
- }), [colorPreset, resolvedMode, style]);
27
+ const varsStyle = useMemo(() => buildScopeVars(colorPreset, resolvedMode), [colorPreset, resolvedMode]);
28
+ let content;
29
+ if (asChild) {
30
+ const child = Children.only(children);
31
+ if (! /*#__PURE__*/isValidElement(child)) {
32
+ throw new Error('BloomColorScope with `asChild` requires a single React element child that accepts a `style` prop.');
33
+ }
34
+ const childStyle = child.props.style;
35
+ const mergedStyle = {
36
+ ...varsStyle,
37
+ ...style,
38
+ ...childStyle
39
+ };
40
+ content = /*#__PURE__*/cloneElement(child, {
41
+ style: mergedStyle
42
+ });
43
+ } else {
44
+ const mergedStyle = {
45
+ ...varsStyle,
46
+ ...style
47
+ };
48
+ content = /*#__PURE__*/_jsx("div", {
49
+ style: mergedStyle,
50
+ children: children
51
+ });
52
+ }
31
53
  return /*#__PURE__*/_jsx(BloomThemeContext.Provider, {
32
54
  value: contextValue,
33
- children: asChild ? children : /*#__PURE__*/_jsx("div", {
34
- style: varsStyle,
35
- children: children
36
- })
55
+ children: content
37
56
  });
38
57
  }
39
58
 
@@ -1 +1 @@
1
- {"version":3,"names":["React","useContext","useMemo","BloomThemeContext","buildTheme","buildScopeVars","jsx","_jsx","BloomColorScope","colorPreset","asChild","style","children","parent","Error","resolvedMode","theme","mode","contextValue","varsStyle","Provider","value","useColorScopeStyle"],"sourceRoot":"../../../../src","sources":["theme/color-scope/index.web.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAElD,SAASC,iBAAiB,QAAqC,0BAAuB;AACtF,SAASC,UAAU,QAAQ,mBAAgB;AAE3C,SAASC,cAAc,QAAQ,oBAAiB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAejD,OAAO,SAASC,eAAeA,CAAC;EAC9BC,WAAW;EACXC,OAAO,GAAG,KAAK;EACfC,KAAK;EACLC;AACoB,CAAC,EAAE;EACvB,MAAMC,MAAM,GAAGZ,UAAU,CAACE,iBAAiB,CAAC;EAC5C,IAAI,CAACU,MAAM,EAAE;IACX,MAAM,IAAIC,KAAK,CAAC,4DAA4D,CAAC;EAC/E;EAEA,MAAMC,YAAY,GAAGF,MAAM,CAACG,KAAK,CAACC,IAAI;EAEtC,MAAMC,YAAY,GAAGhB,OAAO,CAAyB,MAAM;IACzD,MAAMc,KAAK,GAAGZ,UAAU,CAACK,WAAW,EAAEM,YAAY,CAAC;IACnD,OAAO;MAAE,GAAGF,MAAM;MAAEG,KAAK;MAAEP;IAAY,CAAC;EAC1C,CAAC,EAAE,CAACA,WAAW,EAAEM,YAAY,EAAEF,MAAM,CAAC,CAAC;EAEvC,MAAMM,SAAS,GAAGjB,OAAO,CACvB,OAAO;IAAE,GAAIG,cAAc,CAACI,WAAW,EAAEM,YAAY,CAAyB;IAAE,GAAGJ;EAAM,CAAC,CAAC,EAC3F,CAACF,WAAW,EAAEM,YAAY,EAAEJ,KAAK,CACnC,CAAC;EAED,oBACEJ,IAAA,CAACJ,iBAAiB,CAACiB,QAAQ;IAACC,KAAK,EAAEH,YAAa;IAAAN,QAAA,EAC7CF,OAAO,GAAGE,QAAQ,gBAAGL,IAAA;MAAKI,KAAK,EAAEQ,SAAU;MAAAP,QAAA,EAAEA;IAAQ,CAAM;EAAC,CACnC,CAAC;AAEjC;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASU,kBAAkBA,CAACb,WAAyB,EAAuB;EACjF,MAAMI,MAAM,GAAGZ,UAAU,CAACE,iBAAiB,CAAC;EAC5C,IAAI,CAACU,MAAM,EAAE;IACX,MAAM,IAAIC,KAAK,CAAC,+DAA+D,CAAC;EAClF;EACA,MAAMC,YAAY,GAAGF,MAAM,CAACG,KAAK,CAACC,IAAI;EACtC,OAAOf,OAAO,CACZ,MAAMG,cAAc,CAACI,WAAW,EAAEM,YAAY,CAAwB,EACtE,CAACN,WAAW,EAAEM,YAAY,CAC5B,CAAC;AACH","ignoreList":[]}
1
+ {"version":3,"names":["React","Children","cloneElement","isValidElement","useContext","useMemo","BloomThemeContext","buildTheme","buildScopeVars","jsx","_jsx","BloomColorScope","colorPreset","asChild","style","children","parent","Error","resolvedMode","theme","mode","contextValue","varsStyle","content","child","only","childStyle","props","mergedStyle","Provider","value","useColorScopeStyle"],"sourceRoot":"../../../../src","sources":["theme/color-scope/index.web.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,QAAQ,EAAEC,YAAY,EAAEC,cAAc,EAAEC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAE1F,SAASC,iBAAiB,QAAqC,0BAAuB;AACtF,SAASC,UAAU,QAAQ,mBAAgB;AAE3C,SAASC,cAAc,QAAQ,oBAAiB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAmBjD,OAAO,SAASC,eAAeA,CAAC;EAC9BC,WAAW;EACXC,OAAO,GAAG,KAAK;EACfC,KAAK;EACLC;AACoB,CAAC,EAAE;EACvB,MAAMC,MAAM,GAAGZ,UAAU,CAACE,iBAAiB,CAAC;EAC5C,IAAI,CAACU,MAAM,EAAE;IACX,MAAM,IAAIC,KAAK,CAAC,4DAA4D,CAAC;EAC/E;EAEA,MAAMC,YAAY,GAAGF,MAAM,CAACG,KAAK,CAACC,IAAI;EAEtC,MAAMC,YAAY,GAAGhB,OAAO,CAAyB,MAAM;IACzD,MAAMc,KAAK,GAAGZ,UAAU,CAACK,WAAW,EAAEM,YAAY,CAAC;IACnD,OAAO;MAAE,GAAGF,MAAM;MAAEG,KAAK;MAAEP;IAAY,CAAC;EAC1C,CAAC,EAAE,CAACA,WAAW,EAAEM,YAAY,EAAEF,MAAM,CAAC,CAAC;EAEvC,MAAMM,SAAS,GAAGjB,OAAO,CACvB,MAAMG,cAAc,CAACI,WAAW,EAAEM,YAAY,CAAwB,EACtE,CAACN,WAAW,EAAEM,YAAY,CAC5B,CAAC;EAED,IAAIK,OAAwB;EAC5B,IAAIV,OAAO,EAAE;IACX,MAAMW,KAAK,GAAGvB,QAAQ,CAACwB,IAAI,CAACV,QAAQ,CAAC;IACrC,IAAI,eAACZ,cAAc,CAAiBqB,KAAK,CAAC,EAAE;MAC1C,MAAM,IAAIP,KAAK,CACb,mGACF,CAAC;IACH;IACA,MAAMS,UAAU,GAAGF,KAAK,CAACG,KAAK,CAACb,KAAK;IACpC,MAAMc,WAAgC,GAAG;MAAE,GAAGN,SAAS;MAAE,GAAGR,KAAK;MAAE,GAAGY;IAAW,CAAC;IAClFH,OAAO,gBAAGrB,YAAY,CAACsB,KAAK,EAAE;MAAEV,KAAK,EAAEc;IAAY,CAAC,CAAC;EACvD,CAAC,MAAM;IACL,MAAMA,WAAgC,GAAG;MAAE,GAAGN,SAAS;MAAE,GAAGR;IAAM,CAAC;IACnES,OAAO,gBAAGb,IAAA;MAAKI,KAAK,EAAEc,WAAY;MAAAb,QAAA,EAAEA;IAAQ,CAAM,CAAC;EACrD;EAEA,oBAAOL,IAAA,CAACJ,iBAAiB,CAACuB,QAAQ;IAACC,KAAK,EAAET,YAAa;IAAAN,QAAA,EAAEQ;EAAO,CAA6B,CAAC;AAChG;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASQ,kBAAkBA,CAACnB,WAAyB,EAAuB;EACjF,MAAMI,MAAM,GAAGZ,UAAU,CAACE,iBAAiB,CAAC;EAC5C,IAAI,CAACU,MAAM,EAAE;IACX,MAAM,IAAIC,KAAK,CAAC,+DAA+D,CAAC;EAClF;EACA,MAAMC,YAAY,GAAGF,MAAM,CAACG,KAAK,CAACC,IAAI;EACtC,OAAOf,OAAO,CACZ,MAAMG,cAAc,CAACI,WAAW,EAAEM,YAAY,CAAwB,EACtE,CAACN,WAAW,EAAEM,YAAY,CAC5B,CAAC;AACH","ignoreList":[]}
@@ -5,11 +5,11 @@ export interface BloomColorScopeProps {
5
5
  /** Preset to apply within this subtree. */
6
6
  colorPreset: AppColorName;
7
7
  /**
8
- * When `true`, do not render a wrapping `<View>`. The caller owns the
9
- * element that receives the CSS vars (via `useColorScopeStyle`).
8
+ * When `true`, do not render a wrapping `<View>`. The single child is cloned
9
+ * with the scope's CSS vars merged into its `style` prop (Radix-style).
10
10
  */
11
11
  asChild?: boolean;
12
- /** Additional style applied to the wrapping `<View>`. Ignored with `asChild`. */
12
+ /** Additional style applied to the wrapping `<View>` (or merged into the cloned child with `asChild`). */
13
13
  style?: StyleProp<ViewStyle>;
14
14
  children: React.ReactNode;
15
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/theme/color-scope/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,EAAQ,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAIpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,WAAW,oBAAoB;IACnC,2CAA2C;IAC3C,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iFAAiF;IACjF,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,OAAe,EACf,KAAK,EACL,QAAQ,GACT,EAAE,oBAAoB,2CAuBtB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,CAUlF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/theme/color-scope/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsE,MAAM,OAAO,CAAC;AAC3F,OAAO,EAAQ,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAIpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,WAAW,oBAAoB;IACnC,2CAA2C;IAC3C,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0GAA0G;IAC1G,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAMD,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,OAAe,EACf,KAAK,EACL,QAAQ,GACT,EAAE,oBAAoB,2CAkCtB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,CAUlF"}
@@ -4,11 +4,11 @@ export interface BloomColorScopeProps {
4
4
  /** Preset to apply within this subtree. */
5
5
  colorPreset: AppColorName;
6
6
  /**
7
- * When `true`, do not render a wrapping element. The caller owns the
8
- * DOM node that receives the CSS vars (via `useColorScopeStyle`).
7
+ * When `true`, do not render a wrapping `<div>`. The single child is cloned
8
+ * with the scope's CSS vars merged into its `style` prop (Radix-style).
9
9
  */
10
10
  asChild?: boolean;
11
- /** Additional style applied to the wrapping `<div>`. Ignored with `asChild`. */
11
+ /** Additional style applied to the wrapping `<div>` (or merged into the cloned child with `asChild`). */
12
12
  style?: React.CSSProperties;
13
13
  children: React.ReactNode;
14
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../../../src/theme/color-scope/index.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,WAAW,oBAAoB;IACnC,2CAA2C;IAC3C,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gFAAgF;IAChF,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,OAAe,EACf,KAAK,EACL,QAAQ,GACT,EAAE,oBAAoB,2CAuBtB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,YAAY,GAAG,KAAK,CAAC,aAAa,CAUjF"}
1
+ {"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../../../src/theme/color-scope/index.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsE,MAAM,OAAO,CAAC;AAI3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,WAAW,oBAAoB;IACnC,2CAA2C;IAC3C,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,yGAAyG;IACzG,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAMD,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,OAAe,EACf,KAAK,EACL,QAAQ,GACT,EAAE,oBAAoB,2CAmCtB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,YAAY,GAAG,KAAK,CAAC,aAAa,CAUjF"}
@@ -5,11 +5,11 @@ export interface BloomColorScopeProps {
5
5
  /** Preset to apply within this subtree. */
6
6
  colorPreset: AppColorName;
7
7
  /**
8
- * When `true`, do not render a wrapping `<View>`. The caller owns the
9
- * element that receives the CSS vars (via `useColorScopeStyle`).
8
+ * When `true`, do not render a wrapping `<View>`. The single child is cloned
9
+ * with the scope's CSS vars merged into its `style` prop (Radix-style).
10
10
  */
11
11
  asChild?: boolean;
12
- /** Additional style applied to the wrapping `<View>`. Ignored with `asChild`. */
12
+ /** Additional style applied to the wrapping `<View>` (or merged into the cloned child with `asChild`). */
13
13
  style?: StyleProp<ViewStyle>;
14
14
  children: React.ReactNode;
15
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/theme/color-scope/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,EAAQ,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAIpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,WAAW,oBAAoB;IACnC,2CAA2C;IAC3C,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iFAAiF;IACjF,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,OAAe,EACf,KAAK,EACL,QAAQ,GACT,EAAE,oBAAoB,2CAuBtB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,CAUlF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/theme/color-scope/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsE,MAAM,OAAO,CAAC;AAC3F,OAAO,EAAQ,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAIpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,WAAW,oBAAoB;IACnC,2CAA2C;IAC3C,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0GAA0G;IAC1G,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAMD,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,OAAe,EACf,KAAK,EACL,QAAQ,GACT,EAAE,oBAAoB,2CAkCtB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,CAUlF"}
@@ -4,11 +4,11 @@ export interface BloomColorScopeProps {
4
4
  /** Preset to apply within this subtree. */
5
5
  colorPreset: AppColorName;
6
6
  /**
7
- * When `true`, do not render a wrapping element. The caller owns the
8
- * DOM node that receives the CSS vars (via `useColorScopeStyle`).
7
+ * When `true`, do not render a wrapping `<div>`. The single child is cloned
8
+ * with the scope's CSS vars merged into its `style` prop (Radix-style).
9
9
  */
10
10
  asChild?: boolean;
11
- /** Additional style applied to the wrapping `<div>`. Ignored with `asChild`. */
11
+ /** Additional style applied to the wrapping `<div>` (or merged into the cloned child with `asChild`). */
12
12
  style?: React.CSSProperties;
13
13
  children: React.ReactNode;
14
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../../../src/theme/color-scope/index.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,WAAW,oBAAoB;IACnC,2CAA2C;IAC3C,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gFAAgF;IAChF,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,OAAe,EACf,KAAK,EACL,QAAQ,GACT,EAAE,oBAAoB,2CAuBtB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,YAAY,GAAG,KAAK,CAAC,aAAa,CAUjF"}
1
+ {"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../../../src/theme/color-scope/index.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsE,MAAM,OAAO,CAAC;AAI3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,WAAW,oBAAoB;IACnC,2CAA2C;IAC3C,WAAW,EAAE,YAAY,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,yGAAyG;IACzG,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAMD,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,OAAe,EACf,KAAK,EACL,QAAQ,GACT,EAAE,oBAAoB,2CAmCtB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,YAAY,GAAG,KAAK,CAAC,aAAa,CAUjF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oxyhq/bloom",
3
- "version": "0.6.18",
3
+ "version": "0.6.19",
4
4
  "description": "Bloom UI — Oxy ecosystem component library for React Native + Expo + Web",
5
5
  "main": "lib/commonjs/index.js",
6
6
  "module": "lib/module/index.js",
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { Text } from 'react-native';
2
+ import { Text, View, type StyleProp, type ViewStyle } from 'react-native';
3
3
  import { render } from '@testing-library/react-native';
4
4
 
5
5
  import { BloomThemeProvider } from '../theme/BloomThemeProvider';
@@ -11,6 +11,10 @@ function CurrentPreset() {
11
11
  return <Text testID="preset">{colorPreset}</Text>;
12
12
  }
13
13
 
14
+ function StyledChild({ style }: { style?: StyleProp<ViewStyle> }) {
15
+ return <View testID="styled-child" style={style}><CurrentPreset /></View>;
16
+ }
17
+
14
18
  describe('BloomColorScope', () => {
15
19
  it('overrides the colorPreset of its subtree without affecting the parent', () => {
16
20
  const { getAllByTestId } = render(
@@ -27,16 +31,36 @@ describe('BloomColorScope', () => {
27
31
  expect(presets[1]).toBe('green');
28
32
  });
29
33
 
30
- it('renders children directly with asChild (no wrapper element)', () => {
34
+ it('clones the single child and merges scope vars into its style (asChild)', () => {
31
35
  const { getByTestId } = render(
32
36
  <BloomThemeProvider defaultColorPreset="blue" fonts={false}>
33
37
  <BloomColorScope colorPreset="purple" asChild>
34
- <CurrentPreset />
38
+ <StyledChild style={{ padding: 8 }} />
35
39
  </BloomColorScope>
36
40
  </BloomThemeProvider>,
37
41
  );
38
42
 
39
43
  expect(getByTestId('preset').props.children).toBe('purple');
44
+ const mergedStyle = getByTestId('styled-child').props.style;
45
+ expect(Array.isArray(mergedStyle)).toBe(true);
46
+ expect(mergedStyle).toEqual(
47
+ expect.arrayContaining([expect.objectContaining({ padding: 8 })]),
48
+ );
49
+ });
50
+
51
+ it('throws when asChild has multiple children', () => {
52
+ const consoleError = jest.spyOn(console, 'error').mockImplementation(() => {});
53
+ expect(() =>
54
+ render(
55
+ <BloomThemeProvider defaultColorPreset="blue" fonts={false}>
56
+ <BloomColorScope colorPreset="purple" asChild>
57
+ <CurrentPreset />
58
+ <CurrentPreset />
59
+ </BloomColorScope>
60
+ </BloomThemeProvider>,
61
+ ),
62
+ ).toThrow();
63
+ consoleError.mockRestore();
40
64
  });
41
65
 
42
66
  it('throws when used outside BloomThemeProvider', () => {
@@ -1,4 +1,4 @@
1
- import React, { useContext, useMemo } from 'react';
1
+ import React, { Children, cloneElement, isValidElement, useContext, useMemo } from 'react';
2
2
  import { View, type StyleProp, type ViewStyle } from 'react-native';
3
3
 
4
4
  import { BloomThemeContext, type BloomThemeContextValue } from '../BloomThemeProvider';
@@ -10,15 +10,19 @@ export interface BloomColorScopeProps {
10
10
  /** Preset to apply within this subtree. */
11
11
  colorPreset: AppColorName;
12
12
  /**
13
- * When `true`, do not render a wrapping `<View>`. The caller owns the
14
- * element that receives the CSS vars (via `useColorScopeStyle`).
13
+ * When `true`, do not render a wrapping `<View>`. The single child is cloned
14
+ * with the scope's CSS vars merged into its `style` prop (Radix-style).
15
15
  */
16
16
  asChild?: boolean;
17
- /** Additional style applied to the wrapping `<View>`. Ignored with `asChild`. */
17
+ /** Additional style applied to the wrapping `<View>` (or merged into the cloned child with `asChild`). */
18
18
  style?: StyleProp<ViewStyle>;
19
19
  children: React.ReactNode;
20
20
  }
21
21
 
22
+ interface StyleableProps {
23
+ style?: StyleProp<ViewStyle>;
24
+ }
25
+
22
26
  export function BloomColorScope({
23
27
  colorPreset,
24
28
  asChild = false,
@@ -42,11 +46,22 @@ export function BloomColorScope({
42
46
  [colorPreset, resolvedMode],
43
47
  );
44
48
 
45
- return (
46
- <BloomThemeContext.Provider value={contextValue}>
47
- {asChild ? children : <View style={[{ flex: 1 }, varsStyle, style]}>{children}</View>}
48
- </BloomThemeContext.Provider>
49
- );
49
+ let content: React.ReactNode;
50
+ if (asChild) {
51
+ const child = Children.only(children);
52
+ if (!isValidElement<StyleableProps>(child)) {
53
+ throw new Error(
54
+ 'BloomColorScope with `asChild` requires a single React element child that accepts a `style` prop.',
55
+ );
56
+ }
57
+ const childStyle = child.props.style;
58
+ const mergedStyle: StyleProp<ViewStyle> = [varsStyle, style, childStyle];
59
+ content = cloneElement(child, { style: mergedStyle });
60
+ } else {
61
+ content = <View style={[{ flex: 1 }, varsStyle, style]}>{children}</View>;
62
+ }
63
+
64
+ return <BloomThemeContext.Provider value={contextValue}>{content}</BloomThemeContext.Provider>;
50
65
  }
51
66
 
52
67
  /**
@@ -1,4 +1,4 @@
1
- import React, { useContext, useMemo } from 'react';
1
+ import React, { Children, cloneElement, isValidElement, useContext, useMemo } from 'react';
2
2
 
3
3
  import { BloomThemeContext, type BloomThemeContextValue } from '../BloomThemeProvider';
4
4
  import { buildTheme } from '../build-theme';
@@ -9,15 +9,19 @@ export interface BloomColorScopeProps {
9
9
  /** Preset to apply within this subtree. */
10
10
  colorPreset: AppColorName;
11
11
  /**
12
- * When `true`, do not render a wrapping element. The caller owns the
13
- * DOM node that receives the CSS vars (via `useColorScopeStyle`).
12
+ * When `true`, do not render a wrapping `<div>`. The single child is cloned
13
+ * with the scope's CSS vars merged into its `style` prop (Radix-style).
14
14
  */
15
15
  asChild?: boolean;
16
- /** Additional style applied to the wrapping `<div>`. Ignored with `asChild`. */
16
+ /** Additional style applied to the wrapping `<div>` (or merged into the cloned child with `asChild`). */
17
17
  style?: React.CSSProperties;
18
18
  children: React.ReactNode;
19
19
  }
20
20
 
21
+ interface StyleableProps {
22
+ style?: React.CSSProperties;
23
+ }
24
+
21
25
  export function BloomColorScope({
22
26
  colorPreset,
23
27
  asChild = false,
@@ -37,15 +41,27 @@ export function BloomColorScope({
37
41
  }, [colorPreset, resolvedMode, parent]);
38
42
 
39
43
  const varsStyle = useMemo(
40
- () => ({ ...(buildScopeVars(colorPreset, resolvedMode) as React.CSSProperties), ...style }),
41
- [colorPreset, resolvedMode, style],
44
+ () => buildScopeVars(colorPreset, resolvedMode) as React.CSSProperties,
45
+ [colorPreset, resolvedMode],
42
46
  );
43
47
 
44
- return (
45
- <BloomThemeContext.Provider value={contextValue}>
46
- {asChild ? children : <div style={varsStyle}>{children}</div>}
47
- </BloomThemeContext.Provider>
48
- );
48
+ let content: React.ReactNode;
49
+ if (asChild) {
50
+ const child = Children.only(children);
51
+ if (!isValidElement<StyleableProps>(child)) {
52
+ throw new Error(
53
+ 'BloomColorScope with `asChild` requires a single React element child that accepts a `style` prop.',
54
+ );
55
+ }
56
+ const childStyle = child.props.style;
57
+ const mergedStyle: React.CSSProperties = { ...varsStyle, ...style, ...childStyle };
58
+ content = cloneElement(child, { style: mergedStyle });
59
+ } else {
60
+ const mergedStyle: React.CSSProperties = { ...varsStyle, ...style };
61
+ content = <div style={mergedStyle}>{children}</div>;
62
+ }
63
+
64
+ return <BloomThemeContext.Provider value={contextValue}>{content}</BloomThemeContext.Provider>;
49
65
  }
50
66
 
51
67
  /**