@oxy.so/bloom 5.4.1 → 6.1.0

package/lib/commonjs/surface/Surface.js

@@ -4,26 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Surface = void 0;
-var _surfaceStyle = require("../shapes/surface-style.js");
+var _resolveSurfaceGeometry = require("./resolve-surface-geometry.js");
 var _shapes = require("../design-tokens/shapes.js");
 var _react = _interopRequireWildcard(require("react"));
 var _reactNativeCss = require("react-native-css");
 var _reactNative = require("react-native");
-var _colorUtils = require("../theme/color-utils.js");
 var _styledPrimitives = require("../styles/styled-primitives.js");
 var _tokens = require("../styles/tokens.js");
 var _surfaceLevels = require("../styles/surface-levels.js");
-var _useSurfaceLayer = require("./use-surface-layer.js");
-var _shared = require("./shared.js");
+var _useResolvedSurface = require("./use-resolved-surface.js");
 var _SurfacePaint = require("./SurfacePaint.js");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /** Layout-neutral container: callers supply their own padding and content. */
 const SurfaceComponent = /*#__PURE__*/(0, _react.forwardRef)(function SurfaceComponent({
   children,
-  material = 'solid',
   fill,
-  radius = _tokens.borderRadius.xl,
+  radius,
   cornerCurve = _shapes.SURFACE_SHAPES.panel.curve,
   style,
   className,
@@ -31,14 +28,12 @@ const SurfaceComponent = /*#__PURE__*/(0, _react.forwardRef)(function SurfaceCom
   testID,
   ...hostProps
 }, ref) {
-  const glass = material === 'glass';
-  const layer = (0, _useSurfaceLayer.useSurfaceLayer)();
   const resolvedStyle = _reactNative.StyleSheet.flatten(style);
-  const effectiveRadius = resolvedStyle?.borderRadius ?? radius;
-  const tint = fill ?? resolvedStyle?.backgroundColor ?? (glass ? (0, _colorUtils.withAlpha)(layer.fill, 0.25) : layer.fill);
-  const painted = glass || tint !== 'transparent' && (0, _colorUtils.parseRgba)(String(tint))?.a !== 0;
-  const color = (0, _shared.resolveSurfaceFill)(String(tint), glass, layer.parentFill);
-  const publishedFill = painted ? (0, _shared.resolveSurfaceFill)(color, false, layer.parentFill) : layer.parentFill;
+  const geometry = (0, _resolveSurfaceGeometry.resolveSurfaceGeometry)(radius, style, _tokens.borderRadius.xl, cornerCurve);
+  const override = fill ?? resolvedStyle?.backgroundColor;
+  const material = (0, _useResolvedSurface.useResolvedSurface)({
+    fill: override === undefined ? undefined : String(override)
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styledPrimitives.StyledView, {
     ...hostProps,
     ref: ref,
@@ -46,26 +41,19 @@ const SurfaceComponent = /*#__PURE__*/(0, _react.forwardRef)(function SurfaceCom
     accessibilityLabel: accessibilityLabel,
     testID: testID,
     style: [{
-      position: 'relative',
-      borderRadius: effectiveRadius,
-      ...(0, _surfaceStyle.surfaceStyle)({
-        curve: cornerCurve
-      })
+      position: 'relative'
     }, style, {
       backgroundColor: 'transparent',
-      ...(0, _surfaceLevels.surfaceFillVars)(painted ? publishedFill : undefined)
+      ...material.vars,
+      ...geometry.style
     }],
-    children: [painted ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_SurfacePaint.SurfacePaint, {
-      fill: color,
-      backdrop: layer.parentFill,
-      radius: effectiveRadius,
-      shape: {
-        curve: cornerCurve
-      },
-      glass: glass
+    children: [material.painted ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_SurfacePaint.SurfacePaint, {
+      fill: material.paintFill,
+      radius: geometry.radius,
+      shape: geometry.shape
     }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_surfaceLevels.SurfaceLevelProvider, {
-      level: painted ? layer.level : layer.parentLevel,
-      fill: publishedFill,
+      level: material.level,
+      fill: material.publishedFill,
       children: children
     })]
   });

package/lib/commonjs/surface/Surface.js.map

@@ -1 +1 @@
-{"version":3,"names":["_surfaceStyle","require","_shapes","_react","_interopRequireWildcard","_reactNativeCss","_reactNative","_colorUtils","_styledPrimitives","_tokens","_surfaceLevels","_useSurfaceLayer","_shared","_SurfacePaint","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","SurfaceComponent","forwardRef","children","material","fill","radius","borderRadius","xl","cornerCurve","SURFACE_SHAPES","panel","curve","style","className","accessibilityLabel","testID","hostProps","ref","glass","layer","useSurfaceLayer","resolvedStyle","StyleSheet","flatten","effectiveRadius","tint","backgroundColor","withAlpha","painted","parseRgba","String","a","color","resolveSurfaceFill","parentFill","publishedFill","jsxs","StyledView","position","surfaceStyle","surfaceFillVars","undefined","jsx","SurfacePaint","backdrop","shape","SurfaceLevelProvider","level","parentLevel","NativeSurface","styled","Surface","exports","memo","Platform","OS","displayName"],"sourceRoot":"../../../src","sources":["surface/Surface.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_resolveSurfaceGeometry","require","_shapes","_react","_interopRequireWildcard","_reactNativeCss","_reactNative","_styledPrimitives","_tokens","_surfaceLevels","_useResolvedSurface","_SurfacePaint","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","SurfaceComponent","forwardRef","children","fill","radius","cornerCurve","SURFACE_SHAPES","panel","curve","style","className","accessibilityLabel","testID","hostProps","ref","resolvedStyle","StyleSheet","flatten","geometry","resolveSurfaceGeometry","borderRadius","xl","override","backgroundColor","material","useResolvedSurface","undefined","String","jsxs","StyledView","position","vars","painted","jsx","SurfacePaint","paintFill","shape","SurfaceLevelProvider","level","publishedFill","NativeSurface","styled","Surface","exports","memo","Platform","OS","displayName"],"sourceRoot":"../../../src","sources":["surface/Surface.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/surface/Surface.web.js

@@ -4,14 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Surface = void 0;
-var _surfaceStyle = require("../shapes/surface-style.js");
+var _resolveSurfaceGeometry = require("./resolve-surface-geometry.js");
 var _shapes = require("../design-tokens/shapes.js");
 var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _surfaceLevels = require("../styles/surface-levels.js");
-var _useSurfaceLayer = require("./use-surface-layer.js");
+var _useResolvedSurface = require("./use-resolved-surface.js");
 var _useTheme = require("../theme/use-theme.js");
-var _colorUtils = require("../theme/color-utils.js");
 var _tokens = require("../styles/tokens.js");
 var _styledPrimitives = require("../styles/styled-primitives.js");
 var _interactiveWebCss = require("../styles/interactive-web-css.js");
@@ -27,14 +26,12 @@ const CSS = `
   box-sizing: border-box;
 }
 .bloom-surface { overflow: hidden; }
-${(0, _webMaterial.surfaceMaterialCss)('.bloom-surface--solid', 'var(--bloom-surface-fill)')}
-${(0, _webMaterial.surfaceMaterialCss)('.bloom-surface--glass', 'var(--bloom-surface-fill)', 'none', true)}
+${(0, _webMaterial.surfaceMaterialCss)('.bloom-surface--material', 'var(--bloom-surface-fill)')}
 `;
 const SurfaceComponent = /*#__PURE__*/(0, _react.forwardRef)(function SurfaceComponent({
   children,
-  material = 'solid',
   fill,
-  radius = _tokens.borderRadius.xl,
+  radius,
   cornerCurve = _shapes.SURFACE_SHAPES.panel.curve,
   style,
   className,
@@ -43,39 +40,36 @@ const SurfaceComponent = /*#__PURE__*/(0, _react.forwardRef)(function SurfaceCom
   ...hostProps
 }, ref) {
   const theme = (0, _useTheme.useTheme)();
-  const glass = material === 'glass';
-  const layer = (0, _useSurfaceLayer.useSurfaceLayer)();
   const resolvedStyle = _reactNative.StyleSheet.flatten(style);
+  const geometry = (0, _resolveSurfaceGeometry.resolveSurfaceGeometry)(radius, style, _tokens.borderRadius.xl, cornerCurve);
   (0, _interactiveWebCss.useInteractiveWebCss)('bloom-surface-web-css', CSS);
-  (0, _webRefraction.useSurfaceRefraction)(glass);
-  const tint = fill ?? resolvedStyle?.backgroundColor ?? (glass ? (0, _colorUtils.withAlpha)(layer.fill, 0.25) : layer.fill);
-  const painted = glass || tint !== 'transparent' && (0, _colorUtils.parseRgba)(String(tint))?.a !== 0;
-  const color = (0, _shared.resolveSurfaceFill)(String(tint), glass, layer.parentFill);
-  const publishedFill = painted ? (0, _shared.resolveSurfaceFill)(color, false, layer.parentFill) : layer.parentFill;
+  const override = fill ?? resolvedStyle?.backgroundColor;
+  const material = (0, _useResolvedSurface.useResolvedSurface)({
+    fill: override === undefined ? undefined : String(override)
+  });
+  (0, _webRefraction.useSurfaceRefraction)(material.painted);
   const optics = (0, _shared.resolveSurfaceOptics)(theme.isDark);
   const baseStyle = {
     '--bloom-surface-rim': optics.rim,
     '--bloom-surface-sheen': optics.sheenCss,
-    borderRadius: radius,
-    ...(0, _surfaceStyle.surfaceStyle)({
-      curve: cornerCurve
-    }),
+    ...geometry.style,
     backgroundColor: 'transparent',
-    '--bloom-surface-fill': color
+    '--bloom-surface-fill': material.paintFill
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styledPrimitives.StyledView, {
     ...hostProps,
     ref: ref,
-    className: ['bloom-surface', painted ? glass ? 'bloom-surface--glass' : 'bloom-surface--solid' : '', className].filter(Boolean).join(' '),
+    className: ['bloom-surface', material.painted ? 'bloom-surface--material' : '', className].filter(Boolean).join(' '),
     accessibilityLabel: accessibilityLabel,
     testID: testID,
     style: [baseStyle, style, {
       backgroundColor: 'transparent',
-      ...(0, _surfaceLevels.surfaceFillVars)(painted ? publishedFill : undefined)
+      ...material.vars,
+      ...geometry.style
     }],
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_surfaceLevels.SurfaceLevelProvider, {
-      level: painted ? layer.level : layer.parentLevel,
-      fill: publishedFill,
+      level: material.level,
+      fill: material.publishedFill,
       children: children
     })
   });

package/lib/commonjs/surface/Surface.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_surfaceStyle","require","_shapes","_react","_interopRequireWildcard","_reactNative","_surfaceLevels","_useSurfaceLayer","_useTheme","_colorUtils","_tokens","_styledPrimitives","_interactiveWebCss","_shared","_webMaterial","_webRefraction","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","CSS","surfaceMaterialCss","SurfaceComponent","forwardRef","children","material","fill","radius","borderRadius","xl","cornerCurve","SURFACE_SHAPES","panel","curve","style","className","accessibilityLabel","testID","hostProps","ref","theme","useTheme","glass","layer","useSurfaceLayer","resolvedStyle","StyleSheet","flatten","useInteractiveWebCss","useSurfaceRefraction","tint","backgroundColor","withAlpha","painted","parseRgba","String","a","color","resolveSurfaceFill","parentFill","publishedFill","optics","resolveSurfaceOptics","isDark","baseStyle","rim","sheenCss","surfaceStyle","jsx","StyledView","filter","Boolean","join","surfaceFillVars","undefined","SurfaceLevelProvider","level","parentLevel","Surface","exports","memo","displayName"],"sourceRoot":"../../../src","sources":["surface/Surface.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_resolveSurfaceGeometry","require","_shapes","_react","_interopRequireWildcard","_reactNative","_surfaceLevels","_useResolvedSurface","_useTheme","_tokens","_styledPrimitives","_interactiveWebCss","_shared","_webMaterial","_webRefraction","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","CSS","surfaceMaterialCss","SurfaceComponent","forwardRef","children","fill","radius","cornerCurve","SURFACE_SHAPES","panel","curve","style","className","accessibilityLabel","testID","hostProps","ref","theme","useTheme","resolvedStyle","StyleSheet","flatten","geometry","resolveSurfaceGeometry","borderRadius","xl","useInteractiveWebCss","override","backgroundColor","material","useResolvedSurface","undefined","String","useSurfaceRefraction","painted","optics","resolveSurfaceOptics","isDark","baseStyle","rim","sheenCss","paintFill","jsx","StyledView","filter","Boolean","join","vars","SurfaceLevelProvider","level","publishedFill","Surface","exports","memo","displayName"],"sourceRoot":"../../../src","sources":["surface/Surface.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/surface/SurfacePaint.js

@@ -19,8 +19,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const WEB_PAINT_CSS = `
 .bloom-surface-paint { isolation: isolate; overflow: hidden; }
-${(0, _webMaterial.surfaceMaterialCss)('.bloom-surface-paint--solid', 'var(--bloom-surface-paint-fill)')}
-${(0, _webMaterial.surfaceMaterialCss)('.bloom-surface-paint--glass', 'var(--bloom-surface-paint-fill)', 'none', true)}
+${(0, _webMaterial.surfaceMaterialCss)('.bloom-surface-paint', 'var(--bloom-surface-paint-fill)')}
 .bloom-surface-paint--no-sheen::after { background-image: none; }
 `;
 
@@ -32,11 +31,9 @@ ${(0, _webMaterial.surfaceMaterialCss)('.bloom-surface-paint--glass', 'var(--blo
  */
 const SurfacePaint = exports.SurfacePaint = /*#__PURE__*/(0, _react.memo)(function SurfacePaint({
   fill,
-  backdrop,
   radius,
   shape,
   direction = 'ltr',
-  glass = false,
   sheen = true,
   testID
 }) {
@@ -50,10 +47,10 @@ const SurfacePaint = exports.SurfacePaint = /*#__PURE__*/(0, _react.memo)(functi
   };
   const theme = (0, _useTheme.useTheme)();
   const optics = (0, _shared.resolveSurfaceOptics)(theme.isDark);
-  const resolvedFill = fill === undefined ? 'transparent' : (0, _shared.resolveSurfaceFill)(fill, glass, backdrop ?? theme.colors.card);
+  const resolvedFill = (0, _shared.resolveSurfaceTint)(fill ?? 'transparent');
   const id = (0, _svgId.useSvgIdPrefix)('bloom-surface');
   const isWeb = _reactNative.Platform.OS === 'web';
-  (0, _webRefraction.useSurfaceRefraction)(isWeb && glass);
+  (0, _webRefraction.useSurfaceRefraction)(isWeb);
   (0, _react.useEffect)(() => {
     if (isWeb) (0, _adoptStyleSheet.adoptStyleSheet)('bloom-surface-paint-web-css', WEB_PAINT_CSS);
   }, [isWeb]);
@@ -73,7 +70,7 @@ const SurfacePaint = exports.SurfacePaint = /*#__PURE__*/(0, _react.memo)(functi
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styledPrimitives.StyledView, {
       testID: testID,
       pointerEvents: "none",
-      className: `${glass ? 'bloom-surface-paint bloom-surface-paint--glass' : 'bloom-surface-paint bloom-surface-paint--solid'}${sheen ? '' : ' bloom-surface-paint--no-sheen'}`,
+      className: `bloom-surface-paint${sheen ? '' : ' bloom-surface-paint--no-sheen'}`,
       style: paintStyle
     });
   }

package/lib/commonjs/surface/SurfacePaint.js.map

@@ -1 +1 @@
-{"version":3,"names":["_surfaceStyle","require","_react","_interopRequireWildcard","_reactNative","_reactNativeSvg","_svgId","_styledPrimitives","_adoptStyleSheet","_webMaterial","_webRefraction","_useTheme","_shared","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","WEB_PAINT_CSS","surfaceMaterialCss","SurfacePaint","exports","memo","fill","backdrop","radius","shape","direction","glass","sheen","testID","geometry","undefined","borderRadius","surfaceStyle","curve","theme","useTheme","optics","resolveSurfaceOptics","isDark","resolvedFill","resolveSurfaceFill","colors","card","id","useSvgIdPrefix","isWeb","Platform","OS","useSurfaceRefraction","useEffect","adoptStyleSheet","paintStyle","position","top","right","bottom","left","backgroundColor","rim","sheenCss","jsx","StyledView","pointerEvents","className","style","base","surfaceSvgStop","jsxs","View","StyleSheet","absoluteFill","overflow","children","width","height","Defs","LinearGradient","x1","y1","x2","y2","map","stop","Stop","offset","String","stopColor","color","stopOpacity","opacity","Rect","x","y","fillOpacity","boxShadow"],"sourceRoot":"../../../src","sources":["surface/SurfacePaint.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_surfaceStyle","require","_react","_interopRequireWildcard","_reactNative","_reactNativeSvg","_svgId","_styledPrimitives","_adoptStyleSheet","_webMaterial","_webRefraction","_useTheme","_shared","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","WEB_PAINT_CSS","surfaceMaterialCss","SurfacePaint","exports","memo","fill","radius","shape","direction","sheen","testID","geometry","undefined","borderRadius","surfaceStyle","curve","theme","useTheme","optics","resolveSurfaceOptics","isDark","resolvedFill","resolveSurfaceTint","id","useSvgIdPrefix","isWeb","Platform","OS","useSurfaceRefraction","useEffect","adoptStyleSheet","paintStyle","position","top","right","bottom","left","backgroundColor","rim","sheenCss","jsx","StyledView","pointerEvents","className","style","base","surfaceSvgStop","jsxs","View","StyleSheet","absoluteFill","overflow","children","width","height","Defs","LinearGradient","x1","y1","x2","y2","map","stop","Stop","offset","String","stopColor","color","stopOpacity","opacity","Rect","x","y","fillOpacity","boxShadow"],"sourceRoot":"../../../src","sources":["surface/SurfacePaint.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/surface/resolve-surface-geometry.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveSurfaceGeometry = resolveSurfaceGeometry;
+var _reactNative = require("react-native");
+var _surfaceStyle = require("../shapes/surface-style.js");
+/** Explicit axis > resolved caller style/class > family default, on both paint and host. */
+function resolveSurfaceGeometry(radius, style, fallback, curve) {
+  const effectiveRadius = radius ?? _reactNative.StyleSheet.flatten(style)?.borderRadius ?? fallback;
+  const shape = {
+    ...(typeof effectiveRadius === 'number' ? {
+      radius: effectiveRadius
+    } : {}),
+    curve: effectiveRadius === 9999 ? 'round' : curve
+  };
+  return {
+    radius: effectiveRadius,
+    shape,
+    style: {
+      ...(0, _surfaceStyle.surfaceStyle)(shape),
+      borderRadius: effectiveRadius
+    }
+  };
+}
+//# sourceMappingURL=resolve-surface-geometry.js.map

package/lib/commonjs/surface/resolve-surface-geometry.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNative","require","_surfaceStyle","resolveSurfaceGeometry","radius","style","fallback","curve","effectiveRadius","StyleSheet","flatten","borderRadius","shape","surfaceStyle"],"sourceRoot":"../../../src","sources":["surface/resolve-surface-geometry.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AAGA;AACO,SAASE,sBAAsBA,CACpCC,MAA6C,EAC7CC,KAAuC,EACvCC,QAAgB,EAChBC,KAAkB,EAClB;EACA,MAAMC,eAAe,GAAGJ,MAAM,IAAIK,uBAAU,CAACC,OAAO,CAACL,KAAK,CAAC,EAAEM,YAAY,IAAIL,QAAQ;EACrF,MAAMM,KAAmB,GAAG;IAC1B,IAAI,OAAOJ,eAAe,KAAK,QAAQ,GAAG;MAAEJ,MAAM,EAAEI;IAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3ED,KAAK,EAAEC,eAAe,KAAK,IAAI,GAAG,OAAO,GAAGD;EAC9C,CAAC;EACD,OAAO;IAAEH,MAAM,EAAEI,eAAe;IAAEI,KAAK;IAAEP,KAAK,EAAE;MAAE,GAAG,IAAAQ,0BAAY,EAACD,KAAK,CAAC;MAAED,YAAY,EAAEH;IAAgB;EAAE,CAAC;AAC7G","ignoreList":[]}

package/lib/commonjs/surface/resolve-surface-material.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveSurfaceMaterial = resolveSurfaceMaterial;
+var _colorUtils = require("../theme/color-utils.js");
+var _surfaceLevels = require("../styles/surface-levels.js");
+var _shared = require("./shared.js");
+/** One decision for the pixels, descendant backing, depth and CSS aliases. */
+function resolveSurfaceMaterial({
+  fill,
+  parentFill,
+  parentLevel = 0,
+  paint = true,
+  level
+}) {
+  const visible = fill.trim().toLowerCase() !== 'transparent' && (0, _colorUtils.parseRgba)(fill)?.a !== 0;
+  const painted = paint && visible;
+  const paintFill = painted ? (0, _shared.resolveSurfaceTint)(fill) : fill;
+  const publishedFill = (0, _shared.resolveSurfaceFill)(paintFill, parentFill);
+  return {
+    painted,
+    paintFill,
+    publishedFill,
+    level: level ?? (painted ? Math.min(parentLevel + 1, 3) : parentLevel),
+    vars: (0, _surfaceLevels.surfaceFillVars)(visible ? publishedFill : undefined)
+  };
+}
+//# sourceMappingURL=resolve-surface-material.js.map

package/lib/commonjs/surface/resolve-surface-material.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_colorUtils","require","_surfaceLevels","_shared","resolveSurfaceMaterial","fill","parentFill","parentLevel","paint","level","visible","trim","toLowerCase","parseRgba","a","painted","paintFill","resolveSurfaceTint","publishedFill","resolveSurfaceFill","Math","min","vars","surfaceFillVars","undefined"],"sourceRoot":"../../../src","sources":["surface/resolve-surface-material.ts"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAYA;AACO,SAASG,sBAAsBA,CAAC;EAAEC,IAAI;EAAEC,UAAU;EAAEC,WAAW,GAAG,CAAC;EAAEC,KAAK,GAAG,IAAI;EAAEC;AAA4B,CAAC,EAAE;EACvH,MAAMC,OAAO,GAAGL,IAAI,CAACM,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC,KAAK,aAAa,IAAI,IAAAC,qBAAS,EAACR,IAAI,CAAC,EAAES,CAAC,KAAK,CAAC;EACvF,MAAMC,OAAO,GAAGP,KAAK,IAAIE,OAAO;EAChC,MAAMM,SAAS,GAAGD,OAAO,GAAG,IAAAE,0BAAkB,EAACZ,IAAI,CAAC,GAAGA,IAAI;EAC3D,MAAMa,aAAa,GAAG,IAAAC,0BAAkB,EAACH,SAAS,EAAEV,UAAU,CAAC;EAC/D,OAAO;IACLS,OAAO;IACPC,SAAS;IACTE,aAAa;IACbT,KAAK,EAAEA,KAAK,KAAKM,OAAO,GAAGK,IAAI,CAACC,GAAG,CAACd,WAAW,GAAG,CAAC,EAAE,CAAC,CAAC,GAAmBA,WAAW,CAAC;IACtFe,IAAI,EAAE,IAAAC,8BAAe,EAACb,OAAO,GAAGQ,aAAa,GAAGM,SAAS;EAC3D,CAAC;AACH","ignoreList":[]}

package/lib/commonjs/surface/shared.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.SURFACE_SHEEN_CSS = exports.SURFACE_SHEEN = exports.SURFACE_RIM = void 0;
 exports.resolveSurfaceFill = resolveSurfaceFill;
 exports.resolveSurfaceOptics = resolveSurfaceOptics;
+exports.resolveSurfaceTint = resolveSurfaceTint;
 exports.surfaceSvgStop = surfaceSvgStop;
 var _colorUtils = require("../theme/color-utils.js");
 /** Optical light, separate from the tint; SVG must receive opacity separately. */
@@ -66,9 +67,14 @@ function surfaceSvgStop(color) {
   };
 }
 
-/** Solid material flattens a translucent tint onto its resolved backing. */
-function resolveSurfaceFill(fill, glass, backdrop) {
-  if (glass) return fill;
+/** One subtle material: retain explicit alpha; opaque fills transmit ten percent. */
+function resolveSurfaceTint(fill) {
+  const parsed = (0, _colorUtils.parseRgba)(fill);
+  return parsed?.a === 1 ? (0, _colorUtils.withAlpha)(fill, 0.9) : fill;
+}
+
+/** Estimate the backing descendants see by compositing tint onto its parent. */
+function resolveSurfaceFill(fill, backdrop) {
   if (fill.trim().toLowerCase() === 'transparent') return backdrop;
   const tint = (0, _colorUtils.parseRgba)(fill);
   const base = (0, _colorUtils.parseRgba)(backdrop);

package/lib/commonjs/surface/shared.js.map

@@ -1 +1 @@
-{"version":3,"names":["_colorUtils","require","SURFACE_SHEEN","exports","offset","color","opacity","SURFACE_SHEEN_CSS","map","stop","withAlpha","join","SURFACE_RIM","DARK_SHEEN","DARK_SHEEN_CSS","LIGHT_OPTICS","sheen","sheenCss","rim","DARK_OPTICS","resolveSurfaceOptics","isDark","surfaceSvgStop","parsed","parseRgba","r","g","b","a","resolveSurfaceFill","fill","glass","backdrop","trim","toLowerCase","tint","base","channel","front","back","Math","round"],"sourceRoot":"../../../src","sources":["surface/shared.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_colorUtils","require","SURFACE_SHEEN","exports","offset","color","opacity","SURFACE_SHEEN_CSS","map","stop","withAlpha","join","SURFACE_RIM","DARK_SHEEN","DARK_SHEEN_CSS","LIGHT_OPTICS","sheen","sheenCss","rim","DARK_OPTICS","resolveSurfaceOptics","isDark","surfaceSvgStop","parsed","parseRgba","r","g","b","a","resolveSurfaceTint","fill","resolveSurfaceFill","backdrop","trim","toLowerCase","tint","base","channel","front","back","Math","round"],"sourceRoot":"../../../src","sources":["surface/shared.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/surface/use-resolved-surface.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useResolvedSurface = useResolvedSurface;
+var _useSurfaceLayer = require("./use-surface-layer.js");
+var _resolveSurfaceMaterial = require("./resolve-surface-material.js");
+/** Passive surface defaults come from the actual nearest backing. */
+function useResolvedSurface(options = {}) {
+  const parent = (0, _useSurfaceLayer.useSurfaceLayer)();
+  return (0, _resolveSurfaceMaterial.resolveSurfaceMaterial)({
+    ...options,
+    fill: options.fill ?? parent.fill,
+    parentFill: options.parentFill ?? parent.parentFill,
+    parentLevel: options.parentLevel ?? parent.parentLevel
+  });
+}
+//# sourceMappingURL=use-resolved-surface.js.map

package/lib/commonjs/surface/use-resolved-surface.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_useSurfaceLayer","require","_resolveSurfaceMaterial","useResolvedSurface","options","parent","useSurfaceLayer","resolveSurfaceMaterial","fill","parentFill","parentLevel"],"sourceRoot":"../../../src","sources":["surface/use-resolved-surface.ts"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AACA,IAAAC,uBAAA,GAAAD,OAAA;AAEA;AACO,SAASE,kBAAkBA,CAACC,OAAsC,GAAG,CAAC,CAAC,EAAE;EAC9E,MAAMC,MAAM,GAAG,IAAAC,gCAAe,EAAC,CAAC;EAChC,OAAO,IAAAC,8CAAsB,EAAC;IAAE,GAAGH,OAAO;IAAEI,IAAI,EAAEJ,OAAO,CAACI,IAAI,IAAIH,MAAM,CAACG,IAAI;IAAEC,UAAU,EAAEL,OAAO,CAACK,UAAU,IAAIJ,MAAM,CAACI,UAAU;IAAEC,WAAW,EAAEN,OAAO,CAACM,WAAW,IAAIL,MAAM,CAACK;EAAY,CAAC,CAAC;AAC/L","ignoreList":[]}

package/lib/commonjs/surface/use-surface-backing.js

@@ -6,19 +6,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.useSurfaceBacking = useSurfaceBacking;
 var _reactNative = require("react-native");
 var _surfaceLevels = require("../styles/surface-levels.js");
-var _colorUtils = require("../theme/color-utils.js");
-var _shared = require("./shared.js");
+var _resolveSurfaceMaterial = require("./resolve-surface-material.js");
 /** Docked chrome publishes its backing without adding depth or material. */
 function useSurfaceBacking(defaultFill, style, known = true) {
   const parentFill = (0, _surfaceLevels.useSurfaceFill)();
   const level = (0, _surfaceLevels.useSurfaceLevelValue)();
   const background = known ? _reactNative.StyleSheet.flatten(style)?.backgroundColor ?? defaultFill : undefined;
-  const painted = typeof background === 'string' && background !== 'transparent' && (0, _colorUtils.parseRgba)(background)?.a !== 0;
-  const fill = painted ? (0, _shared.resolveSurfaceFill)(background, false, parentFill) : parentFill;
+  const material = (0, _resolveSurfaceMaterial.resolveSurfaceMaterial)({
+    fill: typeof background === 'string' ? background : 'transparent',
+    parentFill,
+    parentLevel: level,
+    paint: false
+  });
   return {
-    fill,
-    level,
-    vars: (0, _surfaceLevels.surfaceFillVars)(painted ? fill : undefined)
+    fill: material.publishedFill,
+    level: material.level,
+    vars: material.vars
   };
 }
 //# sourceMappingURL=use-surface-backing.js.map

package/lib/commonjs/surface/use-surface-backing.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_surfaceLevels","_colorUtils","_shared","useSurfaceBacking","defaultFill","style","known","parentFill","useSurfaceFill","level","useSurfaceLevelValue","background","StyleSheet","flatten","backgroundColor","undefined","painted","parseRgba","a","fill","resolveSurfaceFill","vars","surfaceFillVars"],"sourceRoot":"../../../src","sources":["surface/use-surface-backing.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AAEA;AACO,SAASI,iBAAiBA,CAACC,WAAmC,EAAEC,KAA4B,EAAEC,KAAK,GAAG,IAAI,EAAE;EACjH,MAAMC,UAAU,GAAG,IAAAC,6BAAc,EAAC,CAAC;EACnC,MAAMC,KAAK,GAAG,IAAAC,mCAAoB,EAAC,CAAC;EACpC,MAAMC,UAAU,GAAGL,KAAK,GAAGM,uBAAU,CAACC,OAAO,CAACR,KAAK,CAAC,EAAES,eAAe,IAAIV,WAAW,GAAGW,SAAS;EAChG,MAAMC,OAAO,GAAG,OAAOL,UAAU,KAAK,QAAQ,IAAIA,UAAU,KAAK,aAAa,IAAI,IAAAM,qBAAS,EAACN,UAAU,CAAC,EAAEO,CAAC,KAAK,CAAC;EAChH,MAAMC,IAAI,GAAGH,OAAO,GAAG,IAAAI,0BAAkB,EAACT,UAAU,EAAE,KAAK,EAAEJ,UAAU,CAAC,GAAGA,UAAU;EACrF,OAAO;IAAEY,IAAI;IAAEV,KAAK;IAAEY,IAAI,EAAE,IAAAC,8BAAe,EAACN,OAAO,GAAGG,IAAI,GAAGJ,SAAS;EAAE,CAAC;AAC3E","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_surfaceLevels","_resolveSurfaceMaterial","useSurfaceBacking","defaultFill","style","known","parentFill","useSurfaceFill","level","useSurfaceLevelValue","background","StyleSheet","flatten","backgroundColor","undefined","material","resolveSurfaceMaterial","fill","parentLevel","paint","publishedFill","vars"],"sourceRoot":"../../../src","sources":["surface/use-surface-backing.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,uBAAA,GAAAF,OAAA;AAEA;AACO,SAASG,iBAAiBA,CAACC,WAAmC,EAAEC,KAA4B,EAAEC,KAAK,GAAG,IAAI,EAAE;EACjH,MAAMC,UAAU,GAAG,IAAAC,6BAAc,EAAC,CAAC;EACnC,MAAMC,KAAK,GAAG,IAAAC,mCAAoB,EAAC,CAAC;EACpC,MAAMC,UAAU,GAAGL,KAAK,GAAGM,uBAAU,CAACC,OAAO,CAACR,KAAK,CAAC,EAAES,eAAe,IAAIV,WAAW,GAAGW,SAAS;EAChG,MAAMC,QAAQ,GAAG,IAAAC,8CAAsB,EAAC;IAAEC,IAAI,EAAE,OAAOP,UAAU,KAAK,QAAQ,GAAGA,UAAU,GAAG,aAAa;IAAEJ,UAAU;IAAEY,WAAW,EAAEV,KAAK;IAAEW,KAAK,EAAE;EAAM,CAAC,CAAC;EAC5J,OAAO;IAAEF,IAAI,EAAEF,QAAQ,CAACK,aAAa;IAAEZ,KAAK,EAAEO,QAAQ,CAACP,KAAK;IAAEa,IAAI,EAAEN,QAAQ,CAACM;EAAK,CAAC;AACrF","ignoreList":[]}

package/lib/commonjs/surface/use-surface-material.web.js

@@ -4,20 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useSurfaceMaterial = useSurfaceMaterial;
+var _webRefraction = require("./web-refraction.js");
 var _react = require("react");
 var _BloomThemeProvider = require("../theme/BloomThemeProvider.js");
 var _interactiveWebCss = require("../styles/interactive-web-css.js");
 var _shared = require("./shared.js");
 var _webMaterial = require("./web-material.js");
-/** Decorate an existing web host; preserve its fill, radius, layout and shadow. */
-function useSurfaceMaterial(selector, id) {
-  const css = (0, _react.useMemo)(() => `${selector} { isolation: isolate; }\n${(0, _webMaterial.surfaceMaterialCss)(selector, 'transparent')}`, [selector]);
+/** Move a web host fill into the shared body and edge paint; preserve layout and shadow. */
+function useSurfaceMaterial(selector, id, fill) {
+  (0, _webRefraction.useSurfaceRefraction)(true);
+  const css = (0, _react.useMemo)(() => `${selector} { isolation: isolate; }\n${(0, _webMaterial.surfaceMaterialCss)(selector, 'var(--bloom-surface-fill)')}`, [selector]);
   (0, _interactiveWebCss.useInteractiveWebCss)(id, css);
   const theme = (0, _react.useContext)(_BloomThemeProvider.BloomThemeContext)?.theme;
   const optics = (0, _shared.resolveSurfaceOptics)(theme?.isDark ?? false);
   return (0, _react.useMemo)(() => ({
+    backgroundColor: 'transparent',
+    '--bloom-surface-fill': (0, _shared.resolveSurfaceTint)(fill),
     '--bloom-surface-rim': optics.rim,
     '--bloom-surface-sheen': optics.sheenCss
-  }), [optics]);
+  }), [optics, fill]);
 }
 //# sourceMappingURL=use-surface-material.web.js.map

package/lib/commonjs/surface/use-surface-material.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_BloomThemeProvider","_interactiveWebCss","_shared","_webMaterial","useSurfaceMaterial","selector","id","css","useMemo","surfaceMaterialCss","useInteractiveWebCss","theme","useContext","BloomThemeContext","optics","resolveSurfaceOptics","isDark","rim","sheenCss"],"sourceRoot":"../../../src","sources":["surface/use-surface-material.web.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA;AAEA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,YAAA,GAAAJ,OAAA;AAEA;AACO,SAASK,kBAAkBA,CAACC,QAAgB,EAAEC,EAAU,EAAe;EAC5E,MAAMC,GAAG,GAAG,IAAAC,cAAO,EAAC,MAAM,GAAGH,QAAQ,6BAA6B,IAAAI,+BAAkB,EAACJ,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,CAACA,QAAQ,CAAC,CAAC;EAC5H,IAAAK,uCAAoB,EAACJ,EAAE,EAAEC,GAAG,CAAC;EAC7B,MAAMI,KAAK,GAAG,IAAAC,iBAAU,EAACC,qCAAiB,CAAC,EAAEF,KAAK;EAClD,MAAMG,MAAM,GAAG,IAAAC,4BAAoB,EAACJ,KAAK,EAAEK,MAAM,IAAI,KAAK,CAAC;EAC3D,OAAO,IAAAR,cAAO,EAAC,OAAO;IACpB,qBAAqB,EAAEM,MAAM,CAACG,GAAG;IACjC,uBAAuB,EAAEH,MAAM,CAACI;EAClC,CAAC,CAAC,EAAE,CAACJ,MAAM,CAAC,CAAC;AACf","ignoreList":[]}
+{"version":3,"names":["_webRefraction","require","_react","_BloomThemeProvider","_interactiveWebCss","_shared","_webMaterial","useSurfaceMaterial","selector","id","fill","useSurfaceRefraction","css","useMemo","surfaceMaterialCss","useInteractiveWebCss","theme","useContext","BloomThemeContext","optics","resolveSurfaceOptics","isDark","backgroundColor","resolveSurfaceTint","rim","sheenCss"],"sourceRoot":"../../../src","sources":["surface/use-surface-material.web.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,mBAAA,GAAAF,OAAA;AACA,IAAAG,kBAAA,GAAAH,OAAA;AAEA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,YAAA,GAAAL,OAAA;AAEA;AACO,SAASM,kBAAkBA,CAACC,QAAgB,EAAEC,EAAU,EAAEC,IAAY,EAAe;EAC1F,IAAAC,mCAAoB,EAAC,IAAI,CAAC;EAC1B,MAAMC,GAAG,GAAG,IAAAC,cAAO,EAAC,MAAM,GAAGL,QAAQ,6BAA6B,IAAAM,+BAAkB,EAACN,QAAQ,EAAE,2BAA2B,CAAC,EAAE,EAAE,CAACA,QAAQ,CAAC,CAAC;EAC1I,IAAAO,uCAAoB,EAACN,EAAE,EAAEG,GAAG,CAAC;EAC7B,MAAMI,KAAK,GAAG,IAAAC,iBAAU,EAACC,qCAAiB,CAAC,EAAEF,KAAK;EAClD,MAAMG,MAAM,GAAG,IAAAC,4BAAoB,EAACJ,KAAK,EAAEK,MAAM,IAAI,KAAK,CAAC;EAC3D,OAAO,IAAAR,cAAO,EAAC,OAAO;IACpBS,eAAe,EAAE,aAAa;IAC9B,sBAAsB,EAAE,IAAAC,0BAAkB,EAACb,IAAI,CAAC;IAChD,qBAAqB,EAAES,MAAM,CAACK,GAAG;IACjC,uBAAuB,EAAEL,MAAM,CAACM;EAClC,CAAC,CAAC,EAAE,CAACN,MAAM,EAAET,IAAI,CAAC,CAAC;AACrB","ignoreList":[]}

package/lib/commonjs/surface/web-material.js

@@ -11,7 +11,7 @@ var _webRefraction = require("./web-refraction.js");
  * Root must be positioned/isolated and transparent, with rounded clipping.
  * Both Surface and Button use these exact layers; state changes only their tint.
  */
-function surfaceMaterialCss(selector, fill, transition = 'none', glass = false) {
+function surfaceMaterialCss(selector, fill, transition = 'none') {
   return `
 ${selector}::after {
   content: "";
@@ -21,20 +21,20 @@ ${selector}::after {
   corner-shape: inherit;
   pointer-events: none;
 }
-${glass ? `${selector}::before {
+${selector}::before {
   content: "";
   position: absolute;
   border-radius: inherit;
   corner-shape: inherit;
   pointer-events: none;
   z-index: -2;
-  /* Larger panes collect nearby backdrop pixels before the rounded crop. */
-  inset: -8px;
+  /* Match the pane bounds: expanded filtered layers escape rounded clipping
+     in Chromium. Backdrop blur still supplies lateral samples to displacement. */
+  inset: 0;
   backdrop-filter: blur(3px);
   -webkit-backdrop-filter: blur(3px);
   filter: url(#${_webRefraction.SURFACE_REFRACTION_ID});
 }
-` : ""}
 ${selector}::after {
   z-index: -1;
   background-color: ${fill};

package/lib/commonjs/surface/web-material.js.map

@@ -1 +1 @@
-{"version":3,"names":["_shared","require","_webRefraction","surfaceMaterialCss","selector","fill","transition","glass","SURFACE_REFRACTION_ID","SURFACE_SHEEN_CSS","SURFACE_RIM"],"sourceRoot":"../../../src","sources":["surface/web-material.ts"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,SAASE,kBAAkBA,CAACC,QAAgB,EAAEC,IAAY,EAAEC,UAAU,GAAG,MAAM,EAAEC,KAAK,GAAG,KAAK,EAAU;EAC7G,OAAO;AACT,EAAEH,QAAQ;AACV;AACA;AACA;AACA;AACA;AACA;AACA;AACA,EAAEG,KAAK,GAAG,GAAGH,QAAQ;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiBI,oCAAqB;AACtC;AACA,CAAC,GAAG,EAAE;AACN,EAAEJ,QAAQ;AACV;AACA,sBAAsBC,IAAI;AAC1B,iDAAiDI,yBAAiB;AAClE,yCAAyCC,mBAAW;AACpD,gBAAgBJ,UAAU;AAC1B,EAAE;AACF","ignoreList":[]}
+{"version":3,"names":["_shared","require","_webRefraction","surfaceMaterialCss","selector","fill","transition","SURFACE_REFRACTION_ID","SURFACE_SHEEN_CSS","SURFACE_RIM"],"sourceRoot":"../../../src","sources":["surface/web-material.ts"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,SAASE,kBAAkBA,CAACC,QAAgB,EAAEC,IAAY,EAAEC,UAAU,GAAG,MAAM,EAAU;EAC9F,OAAO;AACT,EAAEF,QAAQ;AACV;AACA;AACA;AACA;AACA;AACA;AACA;AACA,EAAEA,QAAQ;AACV;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,iBAAiBG,oCAAqB;AACtC;AACA,EAAEH,QAAQ;AACV;AACA,sBAAsBC,IAAI;AAC1B,iDAAiDG,yBAAiB;AAClE,yCAAyCC,mBAAW;AACpD,gBAAgBH,UAAU;AAC1B,EAAE;AACF","ignoreList":[]}