react-native-laminar 1.4.3 → 1.4.5

package/lib/commonjs/hooks/use-inline-auto-width.js

@@ -19,12 +19,18 @@ const useInlineAutoWidth = ({
   const measuredWidthRef = (0, _react.useRef)(null);
   const bootstrappedRef = (0, _react.useRef)(false);
   const widthCacheRef = (0, _react.useRef)(new Map());
+  const firstEnabledMeasurementKeyRef = (0, _react.useRef)(null);
   const hasCapturedVisibleLayoutRef = (0, _react.useRef)(false);
   const initialMeasurementKeyRef = (0, _react.useRef)(null);
   const firstProbeRef = (0, _react.useRef)(null);
   const latestProbeRef = (0, _react.useRef)(null);
   const bootstrapTimerRef = (0, _react.useRef)(null);
   const [readyMeasurementKey, setReadyMeasurementKey] = (0, _react.useState)(null);
+
+  // latch the first enabled key so a pending visible layout cannot use a later key
+  if (enabled && firstEnabledMeasurementKeyRef.current === null) {
+    firstEnabledMeasurementKeyRef.current = measurementKey;
+  }
   const markMeasurementReady = (0, _react.useCallback)(key => {
     setReadyMeasurementKey(currentKey => currentKey === key ? currentKey : key);
   }, []);
@@ -79,11 +85,28 @@ const useInlineAutoWidth = ({
     // bootstrap from the visible tree so the first explicit width matches
     // the geometry that was already painted to the user
     const nextWidth = Math.max(0, event.nativeEvent.layout.width);
+    const firstEnabledMeasurementKey = firstEnabledMeasurementKeyRef.current;
+    const visibleKeyMatchesInitialKey = firstEnabledMeasurementKey === null || firstEnabledMeasurementKey === measurementKey;
+    const firstProbe = firstProbeRef.current;
+    if (!visibleKeyMatchesInitialKey) {
+      // ignore a visible layout from the initial row when the key has changed
+      const currentProbeWidth = firstProbe?.key === measurementKey ? firstProbe.width : widthCacheRef.current.get(measurementKey);
+      if (currentProbeWidth !== undefined) {
+        initialMeasurementKeyRef.current = measurementKey;
+        applyWidth(currentProbeWidth);
+        markMeasurementReady(measurementKey);
+      } else if (firstProbe) {
+        // use the old probe as the shell baseline until the current key is measured
+        initialMeasurementKeyRef.current = firstProbe.key;
+        applyWidth(firstProbe.width);
+      }
+      return;
+    }
+
     // retain the visible width for the initial key so a later cache hit does
     // not reintroduce the probe-to-visible mismatch
     widthCacheRef.current.delete(measurementKey);
     widthCacheRef.current.set(measurementKey, nextWidth);
-    const firstProbe = firstProbeRef.current;
     if (firstProbe && firstProbe.key !== measurementKey) {
       initialMeasurementKeyRef.current = firstProbe.key;
       applyWidth(firstProbe.width);

package/lib/commonjs/hooks/use-inline-auto-width.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","WIDTH_CACHE_LIMIT","useInlineAutoWidth","enabled","driveToWidth","measurementKey","widthValue","useSharedValue","hasBootstrappedWidth","measuredWidthRef","useRef","bootstrappedRef","widthCacheRef","Map","hasCapturedVisibleLayoutRef","initialMeasurementKeyRef","firstProbeRef","latestProbeRef","bootstrapTimerRef","readyMeasurementKey","setReadyMeasurementKey","useState","markMeasurementReady","useCallback","key","currentKey","applyWidth","nextWidth","current","value","bootstrapFromProbe","firstProbe","width","latestProbe","captureVisibleLayout","event","clearTimeout","Math","max","nativeEvent","layout","delete","set","captureLayout","ceil","isInitialMeasurement","size","oldestKey","keys","next","undefined","probe","setTimeout","cachedWidth","get","useLayoutEffect","useEffect","animatedWidthStyle","useAnimatedStyle","isReady","shouldMeasure","exports"],"sourceRoot":"../../../src","sources":["hooks/use-inline-auto-width.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","WIDTH_CACHE_LIMIT","useInlineAutoWidth","enabled","driveToWidth","measurementKey","widthValue","useSharedValue","hasBootstrappedWidth","measuredWidthRef","useRef","bootstrappedRef","widthCacheRef","Map","firstEnabledMeasurementKeyRef","hasCapturedVisibleLayoutRef","initialMeasurementKeyRef","firstProbeRef","latestProbeRef","bootstrapTimerRef","readyMeasurementKey","setReadyMeasurementKey","useState","current","markMeasurementReady","useCallback","key","currentKey","applyWidth","nextWidth","value","bootstrapFromProbe","firstProbe","width","latestProbe","captureVisibleLayout","event","clearTimeout","Math","max","nativeEvent","layout","firstEnabledMeasurementKey","visibleKeyMatchesInitialKey","currentProbeWidth","get","undefined","delete","set","captureLayout","ceil","isInitialMeasurement","size","oldestKey","keys","next","probe","setTimeout","cachedWidth","useLayoutEffect","useEffect","animatedWidthStyle","useAnimatedStyle","isReady","shouldMeasure","exports"],"sourceRoot":"../../../src","sources":["hooks/use-inline-auto-width.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/hooks/use-text-glyphs.js

@@ -7,25 +7,21 @@ exports.useTextGlyphs = void 0;
 var _react = require("react");
 var _displayUnits = require("../model/display-units");
 var _textKeys = require("../model/text-keys");
-// build the inline token stream that lets text and leading content share one ledger
+// build text glyphs independently, then prepend a separately keyed leading token
 const useTextGlyphs = (value, namespace, leading, leadingKey) => {
-  const units = (0, _react.useMemo)(() => [
-  // the map key becomes the identity when leading content is state keyed
-  ...(leading ? [{
-    kind: "element",
-    signature: `leading:${String(leadingKey ?? "default")}`,
-    element: leading
-  }] : []), ...(0, _displayUnits.splitDisplayUnits)(value).map(unit => ({
+  // Reconcile text independently so inserting/removing a leading token cannot
+  // change which repeated text glyphs the LCS ledger preserves.
+  const textUnits = (0, _react.useMemo)(() => [...(0, _displayUnits.splitDisplayUnits)(value).map(unit => ({
     kind: "text",
     signature: `text:${unit}`,
     value: unit
-  }))], [leading, leadingKey, value]);
-  const signatures = units.map(unit => unit.signature);
+  }))], [value]);
+  const signatures = textUnits.map(unit => unit.signature);
   const ledgerRef = (0, _react.useRef)({
     previousValue: value,
     previousSignatures: signatures,
-    glyphKeys: units.map((_, index) => `${namespace}:c${index}`),
-    nextSeed: units.length
+    glyphKeys: textUnits.map((_, index) => `${namespace}:c${index}`),
+    nextSeed: textUnits.length
   });
 
   // reconcile only when a token signature changes so stable glyphs keep their views
@@ -41,16 +37,23 @@ const useTextGlyphs = (value, namespace, leading, leadingKey) => {
   }
   const glyphKeys = ledgerRef.current.glyphKeys;
 
-  // normalize spaces at the edge where tokens become renderable glyphs
-  return (0, _react.useMemo)(() => units.map((unit, index) => ({
-    id: glyphKeys[index],
-    kind: unit.kind,
-    ...(unit.kind === "text" ? {
+  // normalize spaces at the edge where tokens become renderable glyphs, then
+  // prepend the leading token with an identity that is independent of text
+  return (0, _react.useMemo)(() => {
+    const textGlyphs = textUnits.map((unit, index) => ({
+      id: glyphKeys[index],
+      kind: "text",
       value: (0, _displayUnits.normalizeDisplayUnit)(unit.value)
-    } : {
-      element: unit.element
-    })
-  })), [glyphKeys, units]);
+    }));
+    if (!leading) {
+      return textGlyphs;
+    }
+    return [{
+      id: `${namespace}:leading:${String(leadingKey ?? "default")}`,
+      kind: "element",
+      element: leading
+    }, ...textGlyphs];
+  }, [glyphKeys, leading, leadingKey, namespace, textUnits]);
 };
 exports.useTextGlyphs = useTextGlyphs;
 //# sourceMappingURL=use-text-glyphs.js.map

package/lib/commonjs/hooks/use-text-glyphs.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_displayUnits","_textKeys","useTextGlyphs","value","namespace","leading","leadingKey","units","useMemo","kind","signature","String","element","splitDisplayUnits","map","unit","signatures","ledgerRef","useRef","previousValue","previousSignatures","glyphKeys","_","index","nextSeed","length","current","some","nextLedger","reconcileTextGlyphKeys","id","normalizeDisplayUnit","exports"],"sourceRoot":"../../../src","sources":["hooks/use-text-glyphs.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AAIA,IAAAE,SAAA,GAAAF,OAAA;AAcA;AACO,MAAMG,aAAa,GAAGA,CAC3BC,KAAa,EACbC,SAAiB,EACjBC,OAAmB,EACnBC,UAA4B,KACF;EAC1B,MAAMC,KAAK,GAAG,IAAAC,cAAO,EACnB,MAAM;EACJ;EACA,IAAIH,OAAO,GACP,CACE;IACEI,IAAI,EAAE,SAAS;IACfC,SAAS,EAAE,WAAWC,MAAM,CAACL,UAAU,IAAI,SAAS,CAAC,EAAE;IACvDM,OAAO,EAAEP;EACX,CAAC,CACF,GACD,EAAE,CAAC,EACP,GAAG,IAAAQ,+BAAiB,EAACV,KAAK,CAAC,CAACW,GAAG,CAAEC,IAAI,KAAM;IACzCN,IAAI,EAAE,MAAe;IACrBC,SAAS,EAAE,QAAQK,IAAI,EAAE;IACzBZ,KAAK,EAAEY;EACT,CAAC,CAAC,CAAC,CACJ,EACD,CAACV,OAAO,EAAEC,UAAU,EAAEH,KAAK,CAC7B,CAAC;EACD,MAAMa,UAAU,GAAGT,KAAK,CAACO,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAACL,SAAS,CAAC;EACtD,MAAMO,SAAS,GAAG,IAAAC,aAAM,EAAkB;IACxCC,aAAa,EAAEhB,KAAK;IACpBiB,kBAAkB,EAAEJ,UAAU;IAC9BK,SAAS,EAAEd,KAAK,CAACO,GAAG,CAAC,CAACQ,CAAC,EAAEC,KAAK,KAAK,GAAGnB,SAAS,KAAKmB,KAAK,EAAE,CAAC;IAC5DC,QAAQ,EAAEjB,KAAK,CAACkB;EAClB,CAAC,CAAC;;EAEF;EACA,IACEtB,KAAK,KAAKc,SAAS,CAACS,OAAO,CAACP,aAAa,IACzCH,UAAU,CAACS,MAAM,KAAKR,SAAS,CAACS,OAAO,CAACN,kBAAkB,CAACK,MAAM,IACjET,UAAU,CAACW,IAAI,CACb,CAACjB,SAAS,EAAEa,KAAK,KAAKb,SAAS,KAAKO,SAAS,CAACS,OAAO,CAACN,kBAAkB,CAACG,KAAK,CAChF,CAAC,EACD;IACA;IACA,MAAMK,UAAU,GAAG,IAAAC,gCAAsB,EACvCZ,SAAS,CAACS,OAAO,CAACN,kBAAkB,EACpCJ,UAAU,EACVC,SAAS,CAACS,OAAO,CAACL,SAAS,EAC3BJ,SAAS,CAACS,OAAO,CAACF,QAAQ,EAC1BpB,SACF,CAAC;IAEDa,SAAS,CAACS,OAAO,GAAG;MAClBP,aAAa,EAAEhB,KAAK;MACpBiB,kBAAkB,EAAEJ,UAAU;MAC9BK,SAAS,EAAEO,UAAU,CAACP,SAAS;MAC/BG,QAAQ,EAAEI,UAAU,CAACJ;IACvB,CAAC;EACH;EAEA,MAAMH,SAAS,GAAGJ,SAAS,CAACS,OAAO,CAACL,SAAS;;EAE7C;EACA,OAAO,IAAAb,cAAO,EACZ,MACED,KAAK,CAACO,GAAG,CAAC,CAACC,IAAI,EAAEQ,KAAK,MAAM;IAC1BO,EAAE,EAAET,SAAS,CAACE,KAAK,CAAC;IACpBd,IAAI,EAAEM,IAAI,CAACN,IAAI;IACf,IAAIM,IAAI,CAACN,IAAI,KAAK,MAAM,GACpB;MAAEN,KAAK,EAAE,IAAA4B,kCAAoB,EAAChB,IAAI,CAACZ,KAAK;IAAE,CAAC,GAC3C;MAAES,OAAO,EAAEG,IAAI,CAACH;IAAQ,CAAC;EAC/B,CAAC,CAAC,CAAC,EACL,CAACS,SAAS,EAAEd,KAAK,CACnB,CAAC;AACH,CAAC;AAACyB,OAAA,CAAA9B,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_displayUnits","_textKeys","useTextGlyphs","value","namespace","leading","leadingKey","textUnits","useMemo","splitDisplayUnits","map","unit","kind","signature","signatures","ledgerRef","useRef","previousValue","previousSignatures","glyphKeys","_","index","nextSeed","length","current","some","nextLedger","reconcileTextGlyphKeys","textGlyphs","id","normalizeDisplayUnit","String","element","exports"],"sourceRoot":"../../../src","sources":["hooks/use-text-glyphs.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AAIA,IAAAE,SAAA,GAAAF,OAAA;AAgBA;AACO,MAAMG,aAAa,GAAGA,CAC3BC,KAAa,EACbC,SAAiB,EACjBC,OAAmB,EACnBC,UAA4B,KACF;EAC1B;EACA;EACA,MAAMC,SAAS,GAAG,IAAAC,cAAO,EACvB,MAAM,CACJ,GAAG,IAAAC,+BAAiB,EAACN,KAAK,CAAC,CAACO,GAAG,CAAEC,IAAI,KAAM;IACzCC,IAAI,EAAE,MAAe;IACrBC,SAAS,EAAE,QAAQF,IAAI,EAAE;IACzBR,KAAK,EAAEQ;EACT,CAAC,CAAC,CAAC,CACJ,EACD,CAACR,KAAK,CACR,CAAC;EACD,MAAMW,UAAU,GAAGP,SAAS,CAACG,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAACE,SAAS,CAAC;EAC1D,MAAME,SAAS,GAAG,IAAAC,aAAM,EAAkB;IACxCC,aAAa,EAAEd,KAAK;IACpBe,kBAAkB,EAAEJ,UAAU;IAC9BK,SAAS,EAAEZ,SAAS,CAACG,GAAG,CAAC,CAACU,CAAC,EAAEC,KAAK,KAAK,GAAGjB,SAAS,KAAKiB,KAAK,EAAE,CAAC;IAChEC,QAAQ,EAAEf,SAAS,CAACgB;EACtB,CAAC,CAAC;;EAEF;EACA,IACEpB,KAAK,KAAKY,SAAS,CAACS,OAAO,CAACP,aAAa,IACzCH,UAAU,CAACS,MAAM,KAAKR,SAAS,CAACS,OAAO,CAACN,kBAAkB,CAACK,MAAM,IACjET,UAAU,CAACW,IAAI,CACb,CAACZ,SAAS,EAAEQ,KAAK,KAAKR,SAAS,KAAKE,SAAS,CAACS,OAAO,CAACN,kBAAkB,CAACG,KAAK,CAChF,CAAC,EACD;IACA;IACA,MAAMK,UAAU,GAAG,IAAAC,gCAAsB,EACvCZ,SAAS,CAACS,OAAO,CAACN,kBAAkB,EACpCJ,UAAU,EACVC,SAAS,CAACS,OAAO,CAACL,SAAS,EAC3BJ,SAAS,CAACS,OAAO,CAACF,QAAQ,EAC1BlB,SACF,CAAC;IAEDW,SAAS,CAACS,OAAO,GAAG;MAClBP,aAAa,EAAEd,KAAK;MACpBe,kBAAkB,EAAEJ,UAAU;MAC9BK,SAAS,EAAEO,UAAU,CAACP,SAAS;MAC/BG,QAAQ,EAAEI,UAAU,CAACJ;IACvB,CAAC;EACH;EAEA,MAAMH,SAAS,GAAGJ,SAAS,CAACS,OAAO,CAACL,SAAS;;EAE7C;EACA;EACA,OAAO,IAAAX,cAAO,EACZ,MAAM;IACJ,MAAMoB,UAAU,GAAGrB,SAAS,CAACG,GAAG,CAAC,CAACC,IAAI,EAAEU,KAAK,MAAM;MACjDQ,EAAE,EAAEV,SAAS,CAACE,KAAK,CAAC;MACpBT,IAAI,EAAE,MAAe;MACrBT,KAAK,EAAE,IAAA2B,kCAAoB,EAACnB,IAAI,CAACR,KAAK;IACxC,CAAC,CAAC,CAAC;IAEH,IAAI,CAACE,OAAO,EAAE;MACZ,OAAOuB,UAAU;IACnB;IAEA,OAAO,CACL;MACEC,EAAE,EAAE,GAAGzB,SAAS,YAAY2B,MAAM,CAACzB,UAAU,IAAI,SAAS,CAAC,EAAE;MAC7DM,IAAI,EAAE,SAAkB;MACxBoB,OAAO,EAAE3B;IACX,CAAC,EACD,GAAGuB,UAAU,CACd;EACH,CAAC,EACD,CAACT,SAAS,EAAEd,OAAO,EAAEC,UAAU,EAAEF,SAAS,EAAEG,SAAS,CACvD,CAAC;AACH,CAAC;AAAC0B,OAAA,CAAA/B,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/commonjs/index.js

@@ -128,6 +128,7 @@ const Laminar = exports.Laminar = /*#__PURE__*/_react.default.memo(function Lami
       motionRecipe: motionRecipe,
       align: align,
       leading: resolvedLeading,
+      leadingLayoutGroup: Boolean(leading),
       leadingKey: resolvedLeadingKey,
       leadingGap: leadingGap,
       ready: !autoSize || isAutoSizeReady,

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_useInlineAutoWidth","_useMorphMotion","_useMorphTextStyle","_displayUnits","_morphViewport","_numberRun","_slotsRun","_textRun","_jsxRuntime","e","__esModule","default","Laminar","exports","React","memo","text","variant","fontSize","color","align","className","leading","leadingKey","leadingGap","style","containerStyle","fontStyle","animationDuration","animationPreset","stagger","autoSize","clipToBounds","resolvedValue","String","leadingMap","isLeadingMap","undefined","resolvedLeading","resolvedLeadingKey","motionRecipe","staggerMs","useMorphMotion","textStyle","useMorphTextStyle","measurementKey","useMemo","flattenedStyle","StyleSheet","flatten","JSON","stringify","fontFamily","fontWeight","fontVariant","letterSpacing","lineHeight","textTransform","Boolean","captureLayout","captureVisibleLayout","animatedWidthStyle","isReady","isAutoSizeReady","shouldMeasure","useInlineAutoWidth","enabled","driveToWidth","driveNumber","measuredValue","splitDisplayUnits","map","normalizeDisplayUnit","join","jsx","MorphViewport","onVisibleLayout","measurement","jsxs","View","onLayout","flexDirection","alignSelf","children","alignItems","justifyContent","marginRight","unit","index","Text","SlotsRun","value","NumberRun","TextRun","ready","isValidElement","Array","isArray"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_useInlineAutoWidth","_useMorphMotion","_useMorphTextStyle","_displayUnits","_morphViewport","_numberRun","_slotsRun","_textRun","_jsxRuntime","e","__esModule","default","Laminar","exports","React","memo","text","variant","fontSize","color","align","className","leading","leadingKey","leadingGap","style","containerStyle","fontStyle","animationDuration","animationPreset","stagger","autoSize","clipToBounds","resolvedValue","String","leadingMap","isLeadingMap","undefined","resolvedLeading","resolvedLeadingKey","motionRecipe","staggerMs","useMorphMotion","textStyle","useMorphTextStyle","measurementKey","useMemo","flattenedStyle","StyleSheet","flatten","JSON","stringify","fontFamily","fontWeight","fontVariant","letterSpacing","lineHeight","textTransform","Boolean","captureLayout","captureVisibleLayout","animatedWidthStyle","isReady","isAutoSizeReady","shouldMeasure","useInlineAutoWidth","enabled","driveToWidth","driveNumber","measuredValue","splitDisplayUnits","map","normalizeDisplayUnit","join","jsx","MorphViewport","onVisibleLayout","measurement","jsxs","View","onLayout","flexDirection","alignSelf","children","alignItems","justifyContent","marginRight","unit","index","Text","SlotsRun","value","NumberRun","TextRun","leadingLayoutGroup","ready","isValidElement","Array","isArray"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/view/glyph-run.js

@@ -14,6 +14,11 @@ const rowStyle = {
   alignItems: "center",
   alignSelf: "flex-start"
 };
+const textRowStyle = {
+  flexDirection: "row",
+  alignItems: "center",
+  alignSelf: "flex-start"
+};
 const rowAlignStyles = {
   left: {
     alignSelf: "flex-start"
@@ -30,6 +35,8 @@ const rowAlignStyles = {
 const GlyphRun = exports.GlyphRun = /*#__PURE__*/_react.default.memo(({
   glyphs,
   layoutTransition,
+  leadingLayoutTransition,
+  leadingLayoutGroup = false,
   enterTransition,
   elementEnterTransition,
   exitTransition,
@@ -38,30 +45,42 @@ const GlyphRun = exports.GlyphRun = /*#__PURE__*/_react.default.memo(({
   align,
   textStyle,
   className
-}) =>
-/*#__PURE__*/
-// each token keeps its own view so reanimated can animate only changed content
-(0, _jsxRuntime.jsx)(_reactNative.View, {
-  style: [rowStyle, rowAlignStyles[align]],
-  children: glyphs.map((glyph, glyphIndex) => glyph.kind === "element" ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
-    layout: layoutTransition,
-    entering: elementEnterTransition ?? enterTransition,
-    exiting: elementExitTransition ?? exitTransition,
-    style: [{
-      alignItems: "center",
-      justifyContent: "center"
-    }, glyphIndex === 0 && (leadingGap ?? 0) > 0 ? {
-      marginRight: leadingGap
-    } : undefined],
-    children: glyph.element
-  }, glyph.id) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.Text, {
+}) => {
+  // The leading token is always first. Keep it outside the text row so its
+  // appearance moves the text as one unit instead of reflowing every glyph.
+  const leadingGlyph = glyphs[0]?.kind === "element" ? glyphs[0] : undefined;
+  const textGlyphs = leadingGlyph ? glyphs.slice(1) : glyphs;
+  const shouldGroupText = Boolean(leadingGlyph) || Boolean(leadingLayoutTransition) || leadingLayoutGroup;
+  const renderTextGlyph = glyph => glyph.kind === "text" ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.Text, {
     layout: layoutTransition,
     entering: enterTransition,
     exiting: exitTransition,
     style: textStyle,
     className: className,
     children: glyph.value
-  }, glyph.id))
-}));
+  }, glyph.id) : null;
+  const textRow = /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
+    layout: leadingLayoutTransition,
+    style: textRowStyle,
+    children: textGlyphs.map(renderTextGlyph)
+  }, "text-row");
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+    style: [rowStyle, rowAlignStyles[align]],
+    children: [leadingGlyph ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
+      // leading elements own their enter/exit geometry; generic layout
+      // motion here would compete with those transitions
+      layout: undefined,
+      entering: elementEnterTransition ?? enterTransition,
+      exiting: elementExitTransition ?? exitTransition,
+      style: [{
+        alignItems: "center",
+        justifyContent: "center"
+      }, (leadingGap ?? 0) > 0 ? {
+        marginRight: leadingGap
+      } : undefined],
+      children: leadingGlyph.element
+    }, leadingGlyph.id) : null, shouldGroupText ? textRow : textGlyphs.map(renderTextGlyph)]
+  });
+});
 GlyphRun.displayName = "GlyphRun";
 //# sourceMappingURL=glyph-run.js.map

package/lib/commonjs/view/glyph-run.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_reactNativeReanimated","_jsxRuntime","e","__esModule","default","rowStyle","flexDirection","alignItems","alignSelf","rowAlignStyles","left","center","right","GlyphRun","exports","React","memo","glyphs","layoutTransition","enterTransition","elementEnterTransition","exitTransition","elementExitTransition","leadingGap","align","textStyle","className","jsx","View","style","children","map","glyph","glyphIndex","kind","layout","entering","exiting","justifyContent","marginRight","undefined","element","id","Text","value","displayName"],"sourceRoot":"../../../src","sources":["view/glyph-run.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAH,sBAAA,CAAAC,OAAA;AAA+C,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAD,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAO/C,MAAMG,QAAQ,GAAG;EACfC,aAAa,EAAE,KAAK;EACpBC,UAAU,EAAE,QAAQ;EACpBC,SAAS,EAAE;AACb,CAAU;AAEV,MAAMC,cAAc,GAAG;EACrBC,IAAI,EAAE;IAAEF,SAAS,EAAE;EAAa,CAAC;EACjCG,MAAM,EAAE;IAAEH,SAAS,EAAE;EAAS,CAAC;EAC/BI,KAAK,EAAE;IAAEJ,SAAS,EAAE;EAAW;AACjC,CAAU;;AAEV;AACO,MAAMK,QAAQ,GAAAC,OAAA,CAAAD,QAAA,gBAAGE,cAAK,CAACC,IAAI,CAChC,CAAC;EACCC,MAAM;EACNC,gBAAgB;EAChBC,eAAe;EACfC,sBAAsB;EACtBC,cAAc;EACdC,qBAAqB;EACrBC,UAAU;EACVC,KAAK;EACLC,SAAS;EACTC;AAYD,CAAC;AAAA;AACA;AACE,IAAAzB,WAAA,CAAA0B,GAAA,EAAC5B,YAAA,CAAA6B,IAAI;EAACC,KAAK,EAAE,CAACxB,QAAQ,EAAEI,cAAc,CAACe,KAAK,CAAC,CAAE;EAAAM,QAAA,EAE5Cb,MAAM,CAACc,GAAG,CAAC,CAACC,KAAK,EAAEC,UAAU,KAC5BD,KAAK,CAACE,IAAI,KAAK,SAAS,gBACtB,IAAAjC,WAAA,CAAA0B,GAAA,EAAC3B,sBAAA,CAAAI,OAAQ,CAACwB,IAAI;IAEZO,MAAM,EAAEjB,gBAAiB;IACzBkB,QAAQ,EAAEhB,sBAAsB,IAAID,eAAgB;IACpDkB,OAAO,EAAEf,qBAAqB,IAAID,cAAe;IACjDQ,KAAK,EAAE,CACL;MAAEtB,UAAU,EAAE,QAAQ;MAAE+B,cAAc,EAAE;IAAS,CAAC,EAClDL,UAAU,KAAK,CAAC,IAAI,CAACV,UAAU,IAAI,CAAC,IAAI,CAAC,GACrC;MAAEgB,WAAW,EAAEhB;IAAW,CAAC,GAC3BiB,SAAS,CACb;IAAAV,QAAA,EAEDE,KAAK,CAACS;EAAO,GAXTT,KAAK,CAACU,EAYE,CAAC,gBAEhB,IAAAzC,WAAA,CAAA0B,GAAA,EAAC3B,sBAAA,CAAAI,OAAQ,CAACuC,IAAI;IAEZR,MAAM,EAAEjB,gBAAiB;IACzBkB,QAAQ,EAAEjB,eAAgB;IAC1BkB,OAAO,EAAEhB,cAAe;IACxBQ,KAAK,EAAEJ,SAAU;IACjBC,SAAS,EAAEA,SAAU;IAAAI,QAAA,EAEpBE,KAAK,CAACY;EAAK,GAPPZ,KAAK,CAACU,EAQE,CAEnB;AAAC,CACG,CAEZ,CAAC;AAED7B,QAAQ,CAACgC,WAAW,GAAG,UAAU","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_reactNativeReanimated","_jsxRuntime","e","__esModule","default","rowStyle","flexDirection","alignItems","alignSelf","textRowStyle","rowAlignStyles","left","center","right","GlyphRun","exports","React","memo","glyphs","layoutTransition","leadingLayoutTransition","leadingLayoutGroup","enterTransition","elementEnterTransition","exitTransition","elementExitTransition","leadingGap","align","textStyle","className","leadingGlyph","kind","undefined","textGlyphs","slice","shouldGroupText","Boolean","renderTextGlyph","glyph","jsx","Text","layout","entering","exiting","style","children","value","id","textRow","View","map","jsxs","justifyContent","marginRight","element","displayName"],"sourceRoot":"../../../src","sources":["view/glyph-run.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/view/text-run.js

@@ -17,6 +17,7 @@ const TextRun = exports.TextRun = /*#__PURE__*/_react.default.memo(({
   motionRecipe,
   align,
   leading,
+  leadingLayoutGroup = false,
   leadingKey,
   leadingGap = 0,
   ready = true,
@@ -47,6 +48,7 @@ const TextRun = exports.TextRun = /*#__PURE__*/_react.default.memo(({
   const lastLeadingKeyRef = (0, _react.useRef)(visibleLeadingKey);
   const hasAnimatedRef = (0, _react.useRef)(false);
   const isLeadingSwap = Boolean(visibleLeading) && lastLeadingPresenceRef.current && visibleLeadingKey !== lastLeadingKeyRef.current;
+  const isLeadingChange = Boolean(visibleLeading) !== lastLeadingPresenceRef.current || Boolean(visibleLeading) && visibleLeadingKey !== lastLeadingKeyRef.current;
   // update the worklet flag after commit so render never writes a shared value
   const leadingSwapProgress = (0, _reactNativeReanimated.useSharedValue)(0);
   (0, _react.useLayoutEffect)(() => {
@@ -75,6 +77,8 @@ const TextRun = exports.TextRun = /*#__PURE__*/_react.default.memo(({
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_glyphRun.GlyphRun, {
     glyphs: glyphs,
     layoutTransition: hasAnimated ? motionRecipe.layoutTransition : undefined,
+    leadingLayoutTransition: isLeadingChange ? motionRecipe.layoutTransition : undefined,
+    leadingLayoutGroup: leadingLayoutGroup,
     enterTransition: hasAnimatedRef.current ? motionRecipe.enterTransition : undefined,
     elementEnterTransition: isLeadingSwap ? elementEnterTransition : undefined,
     exitTransition: motionRecipe.exitTransition,

package/lib/commonjs/view/text-run.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNativeReanimated","_useTextGlyphs","_entryExitBuilders","_glyphRun","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","TextRun","exports","React","memo","value","motionRecipe","align","leading","leadingKey","leadingGap","ready","textStyle","className","scopeId","useId","hasDisplayedRef","useRef","displayedValueRef","displayedLeadingRef","displayedLeadingKeyRef","displayedLeadingGapRef","shouldDisplayTarget","current","visibleValue","visibleLeading","visibleLeadingKey","visibleLeadingGap","lastValueRef","lastLeadingPresenceRef","Boolean","lastLeadingKeyRef","hasAnimatedRef","isLeadingSwap","leadingSwapProgress","useSharedValue","useLayoutEffect","glyphs","useTextGlyphs","elementEnterTransition","useMemo","createLeadingEnterTransition","durationMs","easing","elementExitTransition","createLeadingExitTransition","scale","hasAnimated","jsx","GlyphRun","layoutTransition","undefined","enterTransition","exitTransition","displayName"],"sourceRoot":"../../../src","sources":["view/text-run.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNativeReanimated","_useTextGlyphs","_entryExitBuilders","_glyphRun","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","TextRun","exports","React","memo","value","motionRecipe","align","leading","leadingLayoutGroup","leadingKey","leadingGap","ready","textStyle","className","scopeId","useId","hasDisplayedRef","useRef","displayedValueRef","displayedLeadingRef","displayedLeadingKeyRef","displayedLeadingGapRef","shouldDisplayTarget","current","visibleValue","visibleLeading","visibleLeadingKey","visibleLeadingGap","lastValueRef","lastLeadingPresenceRef","Boolean","lastLeadingKeyRef","hasAnimatedRef","isLeadingSwap","isLeadingChange","leadingSwapProgress","useSharedValue","useLayoutEffect","glyphs","useTextGlyphs","elementEnterTransition","useMemo","createLeadingEnterTransition","durationMs","easing","elementExitTransition","createLeadingExitTransition","scale","hasAnimated","jsx","GlyphRun","layoutTransition","undefined","leadingLayoutTransition","enterTransition","exitTransition","displayName"],"sourceRoot":"../../../src","sources":["view/text-run.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/use-inline-auto-width.js

@@ -15,12 +15,18 @@ export const useInlineAutoWidth = ({
   const measuredWidthRef = useRef(null);
   const bootstrappedRef = useRef(false);
   const widthCacheRef = useRef(new Map());
+  const firstEnabledMeasurementKeyRef = useRef(null);
   const hasCapturedVisibleLayoutRef = useRef(false);
   const initialMeasurementKeyRef = useRef(null);
   const firstProbeRef = useRef(null);
   const latestProbeRef = useRef(null);
   const bootstrapTimerRef = useRef(null);
   const [readyMeasurementKey, setReadyMeasurementKey] = useState(null);
+
+  // latch the first enabled key so a pending visible layout cannot use a later key
+  if (enabled && firstEnabledMeasurementKeyRef.current === null) {
+    firstEnabledMeasurementKeyRef.current = measurementKey;
+  }
   const markMeasurementReady = useCallback(key => {
     setReadyMeasurementKey(currentKey => currentKey === key ? currentKey : key);
   }, []);
@@ -75,11 +81,28 @@ export const useInlineAutoWidth = ({
     // bootstrap from the visible tree so the first explicit width matches
     // the geometry that was already painted to the user
     const nextWidth = Math.max(0, event.nativeEvent.layout.width);
+    const firstEnabledMeasurementKey = firstEnabledMeasurementKeyRef.current;
+    const visibleKeyMatchesInitialKey = firstEnabledMeasurementKey === null || firstEnabledMeasurementKey === measurementKey;
+    const firstProbe = firstProbeRef.current;
+    if (!visibleKeyMatchesInitialKey) {
+      // ignore a visible layout from the initial row when the key has changed
+      const currentProbeWidth = firstProbe?.key === measurementKey ? firstProbe.width : widthCacheRef.current.get(measurementKey);
+      if (currentProbeWidth !== undefined) {
+        initialMeasurementKeyRef.current = measurementKey;
+        applyWidth(currentProbeWidth);
+        markMeasurementReady(measurementKey);
+      } else if (firstProbe) {
+        // use the old probe as the shell baseline until the current key is measured
+        initialMeasurementKeyRef.current = firstProbe.key;
+        applyWidth(firstProbe.width);
+      }
+      return;
+    }
+
     // retain the visible width for the initial key so a later cache hit does
     // not reintroduce the probe-to-visible mismatch
     widthCacheRef.current.delete(measurementKey);
     widthCacheRef.current.set(measurementKey, nextWidth);
-    const firstProbe = firstProbeRef.current;
     if (firstProbe && firstProbe.key !== measurementKey) {
       initialMeasurementKeyRef.current = firstProbe.key;
       applyWidth(firstProbe.width);

package/lib/module/hooks/use-inline-auto-width.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useEffect","useLayoutEffect","useRef","useState","useAnimatedStyle","useSharedValue","WIDTH_CACHE_LIMIT","useInlineAutoWidth","enabled","driveToWidth","measurementKey","widthValue","hasBootstrappedWidth","measuredWidthRef","bootstrappedRef","widthCacheRef","Map","hasCapturedVisibleLayoutRef","initialMeasurementKeyRef","firstProbeRef","latestProbeRef","bootstrapTimerRef","readyMeasurementKey","setReadyMeasurementKey","markMeasurementReady","key","currentKey","applyWidth","nextWidth","current","value","bootstrapFromProbe","firstProbe","width","latestProbe","captureVisibleLayout","event","clearTimeout","Math","max","nativeEvent","layout","delete","set","captureLayout","ceil","isInitialMeasurement","size","oldestKey","keys","next","undefined","probe","setTimeout","cachedWidth","get","animatedWidthStyle","isReady","shouldMeasure"],"sourceRoot":"../../../src","sources":["hooks/use-inline-auto-width.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useEffect","useLayoutEffect","useRef","useState","useAnimatedStyle","useSharedValue","WIDTH_CACHE_LIMIT","useInlineAutoWidth","enabled","driveToWidth","measurementKey","widthValue","hasBootstrappedWidth","measuredWidthRef","bootstrappedRef","widthCacheRef","Map","firstEnabledMeasurementKeyRef","hasCapturedVisibleLayoutRef","initialMeasurementKeyRef","firstProbeRef","latestProbeRef","bootstrapTimerRef","readyMeasurementKey","setReadyMeasurementKey","current","markMeasurementReady","key","currentKey","applyWidth","nextWidth","value","bootstrapFromProbe","firstProbe","width","latestProbe","captureVisibleLayout","event","clearTimeout","Math","max","nativeEvent","layout","firstEnabledMeasurementKey","visibleKeyMatchesInitialKey","currentProbeWidth","get","undefined","delete","set","captureLayout","ceil","isInitialMeasurement","size","oldestKey","keys","next","probe","setTimeout","cachedWidth","animatedWidthStyle","isReady","shouldMeasure"],"sourceRoot":"../../../src","sources":["hooks/use-inline-auto-width.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/use-text-glyphs.js

@@ -3,25 +3,21 @@
 import { useMemo, useRef } from "react";
 import { normalizeDisplayUnit, splitDisplayUnits } from "../model/display-units.js";
 import { reconcileTextGlyphKeys } from "../model/text-keys.js";
-// build the inline token stream that lets text and leading content share one ledger
+// build text glyphs independently, then prepend a separately keyed leading token
 export const useTextGlyphs = (value, namespace, leading, leadingKey) => {
-  const units = useMemo(() => [
-  // the map key becomes the identity when leading content is state keyed
-  ...(leading ? [{
-    kind: "element",
-    signature: `leading:${String(leadingKey ?? "default")}`,
-    element: leading
-  }] : []), ...splitDisplayUnits(value).map(unit => ({
+  // Reconcile text independently so inserting/removing a leading token cannot
+  // change which repeated text glyphs the LCS ledger preserves.
+  const textUnits = useMemo(() => [...splitDisplayUnits(value).map(unit => ({
     kind: "text",
     signature: `text:${unit}`,
     value: unit
-  }))], [leading, leadingKey, value]);
-  const signatures = units.map(unit => unit.signature);
+  }))], [value]);
+  const signatures = textUnits.map(unit => unit.signature);
   const ledgerRef = useRef({
     previousValue: value,
     previousSignatures: signatures,
-    glyphKeys: units.map((_, index) => `${namespace}:c${index}`),
-    nextSeed: units.length
+    glyphKeys: textUnits.map((_, index) => `${namespace}:c${index}`),
+    nextSeed: textUnits.length
   });
 
   // reconcile only when a token signature changes so stable glyphs keep their views
@@ -37,15 +33,22 @@ export const useTextGlyphs = (value, namespace, leading, leadingKey) => {
   }
   const glyphKeys = ledgerRef.current.glyphKeys;
 
-  // normalize spaces at the edge where tokens become renderable glyphs
-  return useMemo(() => units.map((unit, index) => ({
-    id: glyphKeys[index],
-    kind: unit.kind,
-    ...(unit.kind === "text" ? {
+  // normalize spaces at the edge where tokens become renderable glyphs, then
+  // prepend the leading token with an identity that is independent of text
+  return useMemo(() => {
+    const textGlyphs = textUnits.map((unit, index) => ({
+      id: glyphKeys[index],
+      kind: "text",
       value: normalizeDisplayUnit(unit.value)
-    } : {
-      element: unit.element
-    })
-  })), [glyphKeys, units]);
+    }));
+    if (!leading) {
+      return textGlyphs;
+    }
+    return [{
+      id: `${namespace}:leading:${String(leadingKey ?? "default")}`,
+      kind: "element",
+      element: leading
+    }, ...textGlyphs];
+  }, [glyphKeys, leading, leadingKey, namespace, textUnits]);
 };
 //# sourceMappingURL=use-text-glyphs.js.map

package/lib/module/hooks/use-text-glyphs.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useRef","normalizeDisplayUnit","splitDisplayUnits","reconcileTextGlyphKeys","useTextGlyphs","value","namespace","leading","leadingKey","units","kind","signature","String","element","map","unit","signatures","ledgerRef","previousValue","previousSignatures","glyphKeys","_","index","nextSeed","length","current","some","nextLedger","id"],"sourceRoot":"../../../src","sources":["hooks/use-text-glyphs.ts"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,MAAM,QAAwB,OAAO;AACvD,SACEC,oBAAoB,EACpBC,iBAAiB,QACZ,2BAAwB;AAC/B,SAASC,sBAAsB,QAAQ,uBAAoB;AAc3D;AACA,OAAO,MAAMC,aAAa,GAAGA,CAC3BC,KAAa,EACbC,SAAiB,EACjBC,OAAmB,EACnBC,UAA4B,KACF;EAC1B,MAAMC,KAAK,GAAGV,OAAO,CACnB,MAAM;EACJ;EACA,IAAIQ,OAAO,GACP,CACE;IACEG,IAAI,EAAE,SAAS;IACfC,SAAS,EAAE,WAAWC,MAAM,CAACJ,UAAU,IAAI,SAAS,CAAC,EAAE;IACvDK,OAAO,EAAEN;EACX,CAAC,CACF,GACD,EAAE,CAAC,EACP,GAAGL,iBAAiB,CAACG,KAAK,CAAC,CAACS,GAAG,CAAEC,IAAI,KAAM;IACzCL,IAAI,EAAE,MAAe;IACrBC,SAAS,EAAE,QAAQI,IAAI,EAAE;IACzBV,KAAK,EAAEU;EACT,CAAC,CAAC,CAAC,CACJ,EACD,CAACR,OAAO,EAAEC,UAAU,EAAEH,KAAK,CAC7B,CAAC;EACD,MAAMW,UAAU,GAAGP,KAAK,CAACK,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAACJ,SAAS,CAAC;EACtD,MAAMM,SAAS,GAAGjB,MAAM,CAAkB;IACxCkB,aAAa,EAAEb,KAAK;IACpBc,kBAAkB,EAAEH,UAAU;IAC9BI,SAAS,EAAEX,KAAK,CAACK,GAAG,CAAC,CAACO,CAAC,EAAEC,KAAK,KAAK,GAAGhB,SAAS,KAAKgB,KAAK,EAAE,CAAC;IAC5DC,QAAQ,EAAEd,KAAK,CAACe;EAClB,CAAC,CAAC;;EAEF;EACA,IACEnB,KAAK,KAAKY,SAAS,CAACQ,OAAO,CAACP,aAAa,IACzCF,UAAU,CAACQ,MAAM,KAAKP,SAAS,CAACQ,OAAO,CAACN,kBAAkB,CAACK,MAAM,IACjER,UAAU,CAACU,IAAI,CACb,CAACf,SAAS,EAAEW,KAAK,KAAKX,SAAS,KAAKM,SAAS,CAACQ,OAAO,CAACN,kBAAkB,CAACG,KAAK,CAChF,CAAC,EACD;IACA;IACA,MAAMK,UAAU,GAAGxB,sBAAsB,CACvCc,SAAS,CAACQ,OAAO,CAACN,kBAAkB,EACpCH,UAAU,EACVC,SAAS,CAACQ,OAAO,CAACL,SAAS,EAC3BH,SAAS,CAACQ,OAAO,CAACF,QAAQ,EAC1BjB,SACF,CAAC;IAEDW,SAAS,CAACQ,OAAO,GAAG;MAClBP,aAAa,EAAEb,KAAK;MACpBc,kBAAkB,EAAEH,UAAU;MAC9BI,SAAS,EAAEO,UAAU,CAACP,SAAS;MAC/BG,QAAQ,EAAEI,UAAU,CAACJ;IACvB,CAAC;EACH;EAEA,MAAMH,SAAS,GAAGH,SAAS,CAACQ,OAAO,CAACL,SAAS;;EAE7C;EACA,OAAOrB,OAAO,CACZ,MACEU,KAAK,CAACK,GAAG,CAAC,CAACC,IAAI,EAAEO,KAAK,MAAM;IAC1BM,EAAE,EAAER,SAAS,CAACE,KAAK,CAAC;IACpBZ,IAAI,EAAEK,IAAI,CAACL,IAAI;IACf,IAAIK,IAAI,CAACL,IAAI,KAAK,MAAM,GACpB;MAAEL,KAAK,EAAEJ,oBAAoB,CAACc,IAAI,CAACV,KAAK;IAAE,CAAC,GAC3C;MAAEQ,OAAO,EAAEE,IAAI,CAACF;IAAQ,CAAC;EAC/B,CAAC,CAAC,CAAC,EACL,CAACO,SAAS,EAAEX,KAAK,CACnB,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useMemo","useRef","normalizeDisplayUnit","splitDisplayUnits","reconcileTextGlyphKeys","useTextGlyphs","value","namespace","leading","leadingKey","textUnits","map","unit","kind","signature","signatures","ledgerRef","previousValue","previousSignatures","glyphKeys","_","index","nextSeed","length","current","some","nextLedger","textGlyphs","id","String","element"],"sourceRoot":"../../../src","sources":["hooks/use-text-glyphs.ts"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,MAAM,QAAwB,OAAO;AACvD,SACEC,oBAAoB,EACpBC,iBAAiB,QACZ,2BAAwB;AAC/B,SAASC,sBAAsB,QAAQ,uBAAoB;AAgB3D;AACA,OAAO,MAAMC,aAAa,GAAGA,CAC3BC,KAAa,EACbC,SAAiB,EACjBC,OAAmB,EACnBC,UAA4B,KACF;EAC1B;EACA;EACA,MAAMC,SAAS,GAAGV,OAAO,CACvB,MAAM,CACJ,GAAGG,iBAAiB,CAACG,KAAK,CAAC,CAACK,GAAG,CAAEC,IAAI,KAAM;IACzCC,IAAI,EAAE,MAAe;IACrBC,SAAS,EAAE,QAAQF,IAAI,EAAE;IACzBN,KAAK,EAAEM;EACT,CAAC,CAAC,CAAC,CACJ,EACD,CAACN,KAAK,CACR,CAAC;EACD,MAAMS,UAAU,GAAGL,SAAS,CAACC,GAAG,CAAEC,IAAI,IAAKA,IAAI,CAACE,SAAS,CAAC;EAC1D,MAAME,SAAS,GAAGf,MAAM,CAAkB;IACxCgB,aAAa,EAAEX,KAAK;IACpBY,kBAAkB,EAAEH,UAAU;IAC9BI,SAAS,EAAET,SAAS,CAACC,GAAG,CAAC,CAACS,CAAC,EAAEC,KAAK,KAAK,GAAGd,SAAS,KAAKc,KAAK,EAAE,CAAC;IAChEC,QAAQ,EAAEZ,SAAS,CAACa;EACtB,CAAC,CAAC;;EAEF;EACA,IACEjB,KAAK,KAAKU,SAAS,CAACQ,OAAO,CAACP,aAAa,IACzCF,UAAU,CAACQ,MAAM,KAAKP,SAAS,CAACQ,OAAO,CAACN,kBAAkB,CAACK,MAAM,IACjER,UAAU,CAACU,IAAI,CACb,CAACX,SAAS,EAAEO,KAAK,KAAKP,SAAS,KAAKE,SAAS,CAACQ,OAAO,CAACN,kBAAkB,CAACG,KAAK,CAChF,CAAC,EACD;IACA;IACA,MAAMK,UAAU,GAAGtB,sBAAsB,CACvCY,SAAS,CAACQ,OAAO,CAACN,kBAAkB,EACpCH,UAAU,EACVC,SAAS,CAACQ,OAAO,CAACL,SAAS,EAC3BH,SAAS,CAACQ,OAAO,CAACF,QAAQ,EAC1Bf,SACF,CAAC;IAEDS,SAAS,CAACQ,OAAO,GAAG;MAClBP,aAAa,EAAEX,KAAK;MACpBY,kBAAkB,EAAEH,UAAU;MAC9BI,SAAS,EAAEO,UAAU,CAACP,SAAS;MAC/BG,QAAQ,EAAEI,UAAU,CAACJ;IACvB,CAAC;EACH;EAEA,MAAMH,SAAS,GAAGH,SAAS,CAACQ,OAAO,CAACL,SAAS;;EAE7C;EACA;EACA,OAAOnB,OAAO,CACZ,MAAM;IACJ,MAAM2B,UAAU,GAAGjB,SAAS,CAACC,GAAG,CAAC,CAACC,IAAI,EAAES,KAAK,MAAM;MACjDO,EAAE,EAAET,SAAS,CAACE,KAAK,CAAC;MACpBR,IAAI,EAAE,MAAe;MACrBP,KAAK,EAAEJ,oBAAoB,CAACU,IAAI,CAACN,KAAK;IACxC,CAAC,CAAC,CAAC;IAEH,IAAI,CAACE,OAAO,EAAE;MACZ,OAAOmB,UAAU;IACnB;IAEA,OAAO,CACL;MACEC,EAAE,EAAE,GAAGrB,SAAS,YAAYsB,MAAM,CAACpB,UAAU,IAAI,SAAS,CAAC,EAAE;MAC7DI,IAAI,EAAE,SAAkB;MACxBiB,OAAO,EAAEtB;IACX,CAAC,EACD,GAAGmB,UAAU,CACd;EACH,CAAC,EACD,CAACR,SAAS,EAAEX,OAAO,EAAEC,UAAU,EAAEF,SAAS,EAAEG,SAAS,CACvD,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/module/index.js

@@ -124,6 +124,7 @@ export const Laminar = /*#__PURE__*/React.memo(function Laminar({
       motionRecipe: motionRecipe,
       align: align,
       leading: resolvedLeading,
+      leadingLayoutGroup: Boolean(leading),
       leadingKey: resolvedLeadingKey,
       leadingGap: leadingGap,
       ready: !autoSize || isAutoSizeReady,