react-native-laminar 1.4.3 → 1.4.4

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.
Files changed (33) hide show
  1. package/lib/commonjs/hooks/use-text-glyphs.js +24 -21
  2. package/lib/commonjs/hooks/use-text-glyphs.js.map +1 -1
  3. package/lib/commonjs/index.js +1 -0
  4. package/lib/commonjs/index.js.map +1 -1
  5. package/lib/commonjs/view/glyph-run.js +38 -19
  6. package/lib/commonjs/view/glyph-run.js.map +1 -1
  7. package/lib/commonjs/view/text-run.js +4 -0
  8. package/lib/commonjs/view/text-run.js.map +1 -1
  9. package/lib/module/hooks/use-text-glyphs.js +24 -21
  10. package/lib/module/hooks/use-text-glyphs.js.map +1 -1
  11. package/lib/module/index.js +1 -0
  12. package/lib/module/index.js.map +1 -1
  13. package/lib/module/view/glyph-run.js +39 -20
  14. package/lib/module/view/glyph-run.js.map +1 -1
  15. package/lib/module/view/text-run.js +4 -0
  16. package/lib/module/view/text-run.js.map +1 -1
  17. package/lib/typescript/commonjs/hooks/use-text-glyphs.d.ts.map +1 -1
  18. package/lib/typescript/commonjs/index.d.ts.map +1 -1
  19. package/lib/typescript/commonjs/view/glyph-run.d.ts +3 -1
  20. package/lib/typescript/commonjs/view/glyph-run.d.ts.map +1 -1
  21. package/lib/typescript/commonjs/view/text-run.d.ts +2 -1
  22. package/lib/typescript/commonjs/view/text-run.d.ts.map +1 -1
  23. package/lib/typescript/module/hooks/use-text-glyphs.d.ts.map +1 -1
  24. package/lib/typescript/module/index.d.ts.map +1 -1
  25. package/lib/typescript/module/view/glyph-run.d.ts +3 -1
  26. package/lib/typescript/module/view/glyph-run.d.ts.map +1 -1
  27. package/lib/typescript/module/view/text-run.d.ts +2 -1
  28. package/lib/typescript/module/view/text-run.d.ts.map +1 -1
  29. package/package.json +1 -1
  30. package/src/hooks/use-text-glyphs.ts +35 -28
  31. package/src/index.tsx +1 -0
  32. package/src/view/glyph-run.tsx +62 -33
  33. package/src/view/text-run.tsx +10 -0
@@ -7,25 +7,21 @@ exports.useTextGlyphs = void 0;
7
7
  var _react = require("react");
8
8
  var _displayUnits = require("../model/display-units");
9
9
  var _textKeys = require("../model/text-keys");
10
- // build the inline token stream that lets text and leading content share one ledger
10
+ // build text glyphs independently, then prepend a separately keyed leading token
11
11
  const useTextGlyphs = (value, namespace, leading, leadingKey) => {
12
- const units = (0, _react.useMemo)(() => [
13
- // the map key becomes the identity when leading content is state keyed
14
- ...(leading ? [{
15
- kind: "element",
16
- signature: `leading:${String(leadingKey ?? "default")}`,
17
- element: leading
18
- }] : []), ...(0, _displayUnits.splitDisplayUnits)(value).map(unit => ({
12
+ // Reconcile text independently so inserting/removing a leading token cannot
13
+ // change which repeated text glyphs the LCS ledger preserves.
14
+ const textUnits = (0, _react.useMemo)(() => [...(0, _displayUnits.splitDisplayUnits)(value).map(unit => ({
19
15
  kind: "text",
20
16
  signature: `text:${unit}`,
21
17
  value: unit
22
- }))], [leading, leadingKey, value]);
23
- const signatures = units.map(unit => unit.signature);
18
+ }))], [value]);
19
+ const signatures = textUnits.map(unit => unit.signature);
24
20
  const ledgerRef = (0, _react.useRef)({
25
21
  previousValue: value,
26
22
  previousSignatures: signatures,
27
- glyphKeys: units.map((_, index) => `${namespace}:c${index}`),
28
- nextSeed: units.length
23
+ glyphKeys: textUnits.map((_, index) => `${namespace}:c${index}`),
24
+ nextSeed: textUnits.length
29
25
  });
30
26
 
31
27
  // reconcile only when a token signature changes so stable glyphs keep their views
@@ -41,16 +37,23 @@ const useTextGlyphs = (value, namespace, leading, leadingKey) => {
41
37
  }
42
38
  const glyphKeys = ledgerRef.current.glyphKeys;
43
39
 
44
- // normalize spaces at the edge where tokens become renderable glyphs
45
- return (0, _react.useMemo)(() => units.map((unit, index) => ({
46
- id: glyphKeys[index],
47
- kind: unit.kind,
48
- ...(unit.kind === "text" ? {
40
+ // normalize spaces at the edge where tokens become renderable glyphs, then
41
+ // prepend the leading token with an identity that is independent of text
42
+ return (0, _react.useMemo)(() => {
43
+ const textGlyphs = textUnits.map((unit, index) => ({
44
+ id: glyphKeys[index],
45
+ kind: "text",
49
46
  value: (0, _displayUnits.normalizeDisplayUnit)(unit.value)
50
- } : {
51
- element: unit.element
52
- })
53
- })), [glyphKeys, units]);
47
+ }));
48
+ if (!leading) {
49
+ return textGlyphs;
50
+ }
51
+ return [{
52
+ id: `${namespace}:leading:${String(leadingKey ?? "default")}`,
53
+ kind: "element",
54
+ element: leading
55
+ }, ...textGlyphs];
56
+ }, [glyphKeys, leading, leadingKey, namespace, textUnits]);
54
57
  };
55
58
  exports.useTextGlyphs = useTextGlyphs;
56
59
  //# sourceMappingURL=use-text-glyphs.js.map
@@ -1 +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":[]}
1
+ {"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":[]}
@@ -128,6 +128,7 @@ const Laminar = exports.Laminar = /*#__PURE__*/_react.default.memo(function Lami
128
128
  motionRecipe: motionRecipe,
129
129
  align: align,
130
130
  leading: resolvedLeading,
131
+ leadingLayoutGroup: Boolean(leading),
131
132
  leadingKey: resolvedLeadingKey,
132
133
  leadingGap: leadingGap,
133
134
  ready: !autoSize || isAutoSizeReady,
@@ -1 +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":[]}
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","leadingLayoutGroup","ready","isValidElement","Array","isArray"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}
@@ -14,6 +14,11 @@ const rowStyle = {
14
14
  alignItems: "center",
15
15
  alignSelf: "flex-start"
16
16
  };
17
+ const textRowStyle = {
18
+ flexDirection: "row",
19
+ alignItems: "center",
20
+ alignSelf: "flex-start"
21
+ };
17
22
  const rowAlignStyles = {
18
23
  left: {
19
24
  alignSelf: "flex-start"
@@ -30,6 +35,8 @@ const rowAlignStyles = {
30
35
  const GlyphRun = exports.GlyphRun = /*#__PURE__*/_react.default.memo(({
31
36
  glyphs,
32
37
  layoutTransition,
38
+ leadingLayoutTransition,
39
+ leadingLayoutGroup = false,
33
40
  enterTransition,
34
41
  elementEnterTransition,
35
42
  exitTransition,
@@ -38,30 +45,42 @@ const GlyphRun = exports.GlyphRun = /*#__PURE__*/_react.default.memo(({
38
45
  align,
39
46
  textStyle,
40
47
  className
41
- }) =>
42
- /*#__PURE__*/
43
- // each token keeps its own view so reanimated can animate only changed content
44
- (0, _jsxRuntime.jsx)(_reactNative.View, {
45
- style: [rowStyle, rowAlignStyles[align]],
46
- children: glyphs.map((glyph, glyphIndex) => glyph.kind === "element" ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
47
- layout: layoutTransition,
48
- entering: elementEnterTransition ?? enterTransition,
49
- exiting: elementExitTransition ?? exitTransition,
50
- style: [{
51
- alignItems: "center",
52
- justifyContent: "center"
53
- }, glyphIndex === 0 && (leadingGap ?? 0) > 0 ? {
54
- marginRight: leadingGap
55
- } : undefined],
56
- children: glyph.element
57
- }, glyph.id) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.Text, {
48
+ }) => {
49
+ // The leading token is always first. Keep it outside the text row so its
50
+ // appearance moves the text as one unit instead of reflowing every glyph.
51
+ const leadingGlyph = glyphs[0]?.kind === "element" ? glyphs[0] : undefined;
52
+ const textGlyphs = leadingGlyph ? glyphs.slice(1) : glyphs;
53
+ const shouldGroupText = Boolean(leadingGlyph) || Boolean(leadingLayoutTransition) || leadingLayoutGroup;
54
+ const renderTextGlyph = glyph => glyph.kind === "text" ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.Text, {
58
55
  layout: layoutTransition,
59
56
  entering: enterTransition,
60
57
  exiting: exitTransition,
61
58
  style: textStyle,
62
59
  className: className,
63
60
  children: glyph.value
64
- }, glyph.id))
65
- }));
61
+ }, glyph.id) : null;
62
+ const textRow = /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
63
+ layout: leadingLayoutTransition,
64
+ style: textRowStyle,
65
+ children: textGlyphs.map(renderTextGlyph)
66
+ }, "text-row");
67
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
68
+ style: [rowStyle, rowAlignStyles[align]],
69
+ children: [leadingGlyph ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
70
+ // leading elements own their enter/exit geometry; generic layout
71
+ // motion here would compete with those transitions
72
+ layout: undefined,
73
+ entering: elementEnterTransition ?? enterTransition,
74
+ exiting: elementExitTransition ?? exitTransition,
75
+ style: [{
76
+ alignItems: "center",
77
+ justifyContent: "center"
78
+ }, (leadingGap ?? 0) > 0 ? {
79
+ marginRight: leadingGap
80
+ } : undefined],
81
+ children: leadingGlyph.element
82
+ }, leadingGlyph.id) : null, shouldGroupText ? textRow : textGlyphs.map(renderTextGlyph)]
83
+ });
84
+ });
66
85
  GlyphRun.displayName = "GlyphRun";
67
86
  //# sourceMappingURL=glyph-run.js.map
@@ -1 +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":[]}
1
+ {"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":[]}
@@ -17,6 +17,7 @@ const TextRun = exports.TextRun = /*#__PURE__*/_react.default.memo(({
17
17
  motionRecipe,
18
18
  align,
19
19
  leading,
20
+ leadingLayoutGroup = false,
20
21
  leadingKey,
21
22
  leadingGap = 0,
22
23
  ready = true,
@@ -47,6 +48,7 @@ const TextRun = exports.TextRun = /*#__PURE__*/_react.default.memo(({
47
48
  const lastLeadingKeyRef = (0, _react.useRef)(visibleLeadingKey);
48
49
  const hasAnimatedRef = (0, _react.useRef)(false);
49
50
  const isLeadingSwap = Boolean(visibleLeading) && lastLeadingPresenceRef.current && visibleLeadingKey !== lastLeadingKeyRef.current;
51
+ const isLeadingChange = Boolean(visibleLeading) !== lastLeadingPresenceRef.current || Boolean(visibleLeading) && visibleLeadingKey !== lastLeadingKeyRef.current;
50
52
  // update the worklet flag after commit so render never writes a shared value
51
53
  const leadingSwapProgress = (0, _reactNativeReanimated.useSharedValue)(0);
52
54
  (0, _react.useLayoutEffect)(() => {
@@ -75,6 +77,8 @@ const TextRun = exports.TextRun = /*#__PURE__*/_react.default.memo(({
75
77
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_glyphRun.GlyphRun, {
76
78
  glyphs: glyphs,
77
79
  layoutTransition: hasAnimated ? motionRecipe.layoutTransition : undefined,
80
+ leadingLayoutTransition: isLeadingChange ? motionRecipe.layoutTransition : undefined,
81
+ leadingLayoutGroup: leadingLayoutGroup,
78
82
  enterTransition: hasAnimatedRef.current ? motionRecipe.enterTransition : undefined,
79
83
  elementEnterTransition: isLeadingSwap ? elementEnterTransition : undefined,
80
84
  exitTransition: motionRecipe.exitTransition,
@@ -1 +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":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAGA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,kBAAA,GAAAH,OAAA;AAKA,IAAAI,SAAA,GAAAJ,OAAA;AAAuC,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAD,wBAAAO,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAT,uBAAA,YAAAA,CAAAO,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAcvC;AACO,MAAMkB,OAAO,GAAAC,OAAA,CAAAD,OAAA,gBAAGE,cAAK,CAACC,IAAI,CAC/B,CAAC;EACCC,KAAK;EACLC,YAAY;EACZC,KAAK;EACLC,OAAO;EACPC,UAAU;EACVC,UAAU,GAAG,CAAC;EACdC,KAAK,GAAG,IAAI;EACZC,SAAS;EACTC;AACY,CAAC,KAAK;EAClB;EACA,MAAMC,OAAO,GAAG,IAAAC,YAAK,EAAC,CAAC;EACvB,MAAMC,eAAe,GAAG,IAAAC,aAAM,EAAC,KAAK,CAAC;EACrC,MAAMC,iBAAiB,GAAG,IAAAD,aAAM,EAACZ,KAAK,CAAC;EACvC,MAAMc,mBAAmB,GAAG,IAAAF,aAAM,EAACT,OAAO,CAAC;EAC3C,MAAMY,sBAAsB,GAAG,IAAAH,aAAM,EAACR,UAAU,CAAC;EACjD,MAAMY,sBAAsB,GAAG,IAAAJ,aAAM,EAACP,UAAU,CAAC;EACjD,MAAMY,mBAAmB,GAAGX,KAAK,IAAI,CAACK,eAAe,CAACO,OAAO;EAC7D,MAAMC,YAAY,GAAGF,mBAAmB,GACpCjB,KAAK,GACLa,iBAAiB,CAACK,OAAO;EAC7B,MAAME,cAAc,GAAGH,mBAAmB,GACtCd,OAAO,GACPW,mBAAmB,CAACI,OAAO;EAC/B,MAAMG,iBAAiB,GAAGJ,mBAAmB,GACzCb,UAAU,GACVW,sBAAsB,CAACG,OAAO;EAClC,MAAMI,iBAAiB,GAAGL,mBAAmB,GACzCZ,UAAU,GACVW,sBAAsB,CAACE,OAAO;EAElC,IAAID,mBAAmB,EAAE;IACvBN,eAAe,CAACO,OAAO,GAAG,IAAI;IAC9BL,iBAAiB,CAACK,OAAO,GAAGlB,KAAK;IACjCc,mBAAmB,CAACI,OAAO,GAAGf,OAAO;IACrCY,sBAAsB,CAACG,OAAO,GAAGd,UAAU;IAC3CY,sBAAsB,CAACE,OAAO,GAAGb,UAAU;EAC7C;EAEA,MAAMkB,YAAY,GAAG,IAAAX,aAAM,EAACO,YAAY,CAAC;EACzC,MAAMK,sBAAsB,GAAG,IAAAZ,aAAM,EAACa,OAAO,CAACL,cAAc,CAAC,CAAC;EAC9D,MAAMM,iBAAiB,GAAG,IAAAd,aAAM,EAACS,iBAAiB,CAAC;EACnD,MAAMM,cAAc,GAAG,IAAAf,aAAM,EAAC,KAAK,CAAC;EACpC,MAAMgB,aAAa,GACjBH,OAAO,CAACL,cAAc,CAAC,IACvBI,sBAAsB,CAACN,OAAO,IAC9BG,iBAAiB,KAAKK,iBAAiB,CAACR,OAAO;EACjD;EACA,MAAMW,mBAAmB,GAAG,IAAAC,qCAAc,EAAC,CAAC,CAAC;EAC7C,IAAAC,sBAAe,EAAC,MAAM;IACpBF,mBAAmB,CAAC7B,KAAK,GAAG4B,aAAa,GAAG,CAAC,GAAG,CAAC;EACnD,CAAC,EAAE,CAACA,aAAa,EAAEC,mBAAmB,CAAC,CAAC;EACxC,MAAMG,MAAM,GAAG,IAAAC,4BAAa,EAC1Bd,YAAY,EACZV,OAAO,EACPW,cAAc,EACdC,iBACF,CAAC;EACD,MAAMa,sBAAsB,GAAG,IAAAC,cAAO,EACpC,MACE,IAAAC,+CAA4B,EAAC;IAC3BC,UAAU,EAAEpC,YAAY,CAACoC,UAAU;IACnCC,MAAM,EAAErC,YAAY,CAACqC;EACvB,CAAC,CAAC,EACJ,CAACrC,YAAY,CAACoC,UAAU,EAAEpC,YAAY,CAACqC,MAAM,CAC/C,CAAC;EACD,MAAMC,qBAAqB,GAAG,IAAAJ,cAAO,EACnC,MACE,IAAAK,8CAA2B,EAAC;IAC1BH,UAAU,EAAEpC,YAAY,CAACoC,UAAU;IACnCC,MAAM,EAAErC,YAAY,CAACqC,MAAM;IAC3BjC,UAAU,EAAEiB,iBAAiB;IAC7BmB,KAAK,EAAEZ;EACT,CAAC,CAAC,EACJ,CACEP,iBAAiB,EACjBO,mBAAmB,EACnB5B,YAAY,CAACoC,UAAU,EACvBpC,YAAY,CAACqC,MAAM,CAEvB,CAAC;;EAED;EACA,IACEnB,YAAY,KAAKI,YAAY,CAACL,OAAO,IACrCO,OAAO,CAACL,cAAc,CAAC,KAAKI,sBAAsB,CAACN,OAAO,IAC1DG,iBAAiB,KAAKK,iBAAiB,CAACR,OAAO,EAC/C;IACAS,cAAc,CAACT,OAAO,GAAG,IAAI;IAC7BK,YAAY,CAACL,OAAO,GAAGC,YAAY;IACnCK,sBAAsB,CAACN,OAAO,GAAGO,OAAO,CAACL,cAAc,CAAC;IACxDM,iBAAiB,CAACR,OAAO,GAAGG,iBAAiB;EAC/C;EAEA,MAAMqB,WAAW,GAAGf,cAAc,CAACT,OAAO;EAE1C,oBACE,IAAA1C,WAAA,CAAAmE,GAAA,EAACpE,SAAA,CAAAqE,QAAQ;IACPZ,MAAM,EAAEA,MAAO;IACfa,gBAAgB,EACdH,WAAW,GAAGzC,YAAY,CAAC4C,gBAAgB,GAAGC,SAC/C;IACDC,eAAe,EACbpB,cAAc,CAACT,OAAO,GAClBjB,YAAY,CAAC8C,eAAe,GAC5BD,SACL;IACDZ,sBAAsB,EACpBN,aAAa,GAAGM,sBAAsB,GAAGY,SAC1C;IACDE,cAAc,EAAE/C,YAAY,CAAC+C,cAAe;IAC5CT,qBAAqB,EAAEA,qBAAsB;IAC7ClC,UAAU,EAAEiB,iBAAkB;IAC9BpB,KAAK,EAAEA,KAAM;IACbK,SAAS,EAAEA,SAAU;IACrBC,SAAS,EAAEA;EAAU,CACtB,CAAC;AAEN,CACF,CAAC;AAEDZ,OAAO,CAACqD,WAAW,GAAG,SAAS","ignoreList":[]}
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","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":[]}
@@ -3,25 +3,21 @@
3
3
  import { useMemo, useRef } from "react";
4
4
  import { normalizeDisplayUnit, splitDisplayUnits } from "../model/display-units.js";
5
5
  import { reconcileTextGlyphKeys } from "../model/text-keys.js";
6
- // build the inline token stream that lets text and leading content share one ledger
6
+ // build text glyphs independently, then prepend a separately keyed leading token
7
7
  export const useTextGlyphs = (value, namespace, leading, leadingKey) => {
8
- const units = useMemo(() => [
9
- // the map key becomes the identity when leading content is state keyed
10
- ...(leading ? [{
11
- kind: "element",
12
- signature: `leading:${String(leadingKey ?? "default")}`,
13
- element: leading
14
- }] : []), ...splitDisplayUnits(value).map(unit => ({
8
+ // Reconcile text independently so inserting/removing a leading token cannot
9
+ // change which repeated text glyphs the LCS ledger preserves.
10
+ const textUnits = useMemo(() => [...splitDisplayUnits(value).map(unit => ({
15
11
  kind: "text",
16
12
  signature: `text:${unit}`,
17
13
  value: unit
18
- }))], [leading, leadingKey, value]);
19
- const signatures = units.map(unit => unit.signature);
14
+ }))], [value]);
15
+ const signatures = textUnits.map(unit => unit.signature);
20
16
  const ledgerRef = useRef({
21
17
  previousValue: value,
22
18
  previousSignatures: signatures,
23
- glyphKeys: units.map((_, index) => `${namespace}:c${index}`),
24
- nextSeed: units.length
19
+ glyphKeys: textUnits.map((_, index) => `${namespace}:c${index}`),
20
+ nextSeed: textUnits.length
25
21
  });
26
22
 
27
23
  // reconcile only when a token signature changes so stable glyphs keep their views
@@ -37,15 +33,22 @@ export const useTextGlyphs = (value, namespace, leading, leadingKey) => {
37
33
  }
38
34
  const glyphKeys = ledgerRef.current.glyphKeys;
39
35
 
40
- // normalize spaces at the edge where tokens become renderable glyphs
41
- return useMemo(() => units.map((unit, index) => ({
42
- id: glyphKeys[index],
43
- kind: unit.kind,
44
- ...(unit.kind === "text" ? {
36
+ // normalize spaces at the edge where tokens become renderable glyphs, then
37
+ // prepend the leading token with an identity that is independent of text
38
+ return useMemo(() => {
39
+ const textGlyphs = textUnits.map((unit, index) => ({
40
+ id: glyphKeys[index],
41
+ kind: "text",
45
42
  value: normalizeDisplayUnit(unit.value)
46
- } : {
47
- element: unit.element
48
- })
49
- })), [glyphKeys, units]);
43
+ }));
44
+ if (!leading) {
45
+ return textGlyphs;
46
+ }
47
+ return [{
48
+ id: `${namespace}:leading:${String(leadingKey ?? "default")}`,
49
+ kind: "element",
50
+ element: leading
51
+ }, ...textGlyphs];
52
+ }, [glyphKeys, leading, leadingKey, namespace, textUnits]);
50
53
  };
51
54
  //# sourceMappingURL=use-text-glyphs.js.map
@@ -1 +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":[]}
1
+ {"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":[]}
@@ -124,6 +124,7 @@ export const Laminar = /*#__PURE__*/React.memo(function Laminar({
124
124
  motionRecipe: motionRecipe,
125
125
  align: align,
126
126
  leading: resolvedLeading,
127
+ leadingLayoutGroup: Boolean(leading),
127
128
  leadingKey: resolvedLeadingKey,
128
129
  leadingGap: leadingGap,
129
130
  ready: !autoSize || isAutoSizeReady,
@@ -1 +1 @@
1
- {"version":3,"names":["React","StyleSheet","Text","View","useInlineAutoWidth","useMorphMotion","useMorphTextStyle","normalizeDisplayUnit","splitDisplayUnits","MorphViewport","NumberRun","SlotsRun","TextRun","jsx","_jsx","jsxs","_jsxs","Laminar","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","textStyle","measurementKey","useMemo","flattenedStyle","flatten","JSON","stringify","fontFamily","fontWeight","fontVariant","letterSpacing","lineHeight","textTransform","Boolean","captureLayout","captureVisibleLayout","animatedWidthStyle","isReady","isAutoSizeReady","shouldMeasure","enabled","driveToWidth","driveNumber","measuredValue","map","join","onVisibleLayout","measurement","onLayout","flexDirection","alignSelf","children","alignItems","justifyContent","marginRight","unit","index","value","ready","isValidElement","Array","isArray"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["React","StyleSheet","Text","View","useInlineAutoWidth","useMorphMotion","useMorphTextStyle","normalizeDisplayUnit","splitDisplayUnits","MorphViewport","NumberRun","SlotsRun","TextRun","jsx","_jsx","jsxs","_jsxs","Laminar","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","textStyle","measurementKey","useMemo","flattenedStyle","flatten","JSON","stringify","fontFamily","fontWeight","fontVariant","letterSpacing","lineHeight","textTransform","Boolean","captureLayout","captureVisibleLayout","animatedWidthStyle","isReady","isAutoSizeReady","shouldMeasure","enabled","driveToWidth","driveNumber","measuredValue","map","join","onVisibleLayout","measurement","onLayout","flexDirection","alignSelf","children","alignItems","justifyContent","marginRight","unit","index","value","leadingLayoutGroup","ready","isValidElement","Array","isArray"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}
@@ -3,12 +3,17 @@
3
3
  import React from "react";
4
4
  import { View } from "react-native";
5
5
  import Animated from "react-native-reanimated";
6
- import { jsx as _jsx } from "react/jsx-runtime";
6
+ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
7
7
  const rowStyle = {
8
8
  flexDirection: "row",
9
9
  alignItems: "center",
10
10
  alignSelf: "flex-start"
11
11
  };
12
+ const textRowStyle = {
13
+ flexDirection: "row",
14
+ alignItems: "center",
15
+ alignSelf: "flex-start"
16
+ };
12
17
  const rowAlignStyles = {
13
18
  left: {
14
19
  alignSelf: "flex-start"
@@ -25,6 +30,8 @@ const rowAlignStyles = {
25
30
  export const GlyphRun = /*#__PURE__*/React.memo(({
26
31
  glyphs,
27
32
  layoutTransition,
33
+ leadingLayoutTransition,
34
+ leadingLayoutGroup = false,
28
35
  enterTransition,
29
36
  elementEnterTransition,
30
37
  exitTransition,
@@ -33,30 +40,42 @@ export const GlyphRun = /*#__PURE__*/React.memo(({
33
40
  align,
34
41
  textStyle,
35
42
  className
36
- }) =>
37
- /*#__PURE__*/
38
- // each token keeps its own view so reanimated can animate only changed content
39
- _jsx(View, {
40
- style: [rowStyle, rowAlignStyles[align]],
41
- children: glyphs.map((glyph, glyphIndex) => glyph.kind === "element" ? /*#__PURE__*/_jsx(Animated.View, {
42
- layout: layoutTransition,
43
- entering: elementEnterTransition ?? enterTransition,
44
- exiting: elementExitTransition ?? exitTransition,
45
- style: [{
46
- alignItems: "center",
47
- justifyContent: "center"
48
- }, glyphIndex === 0 && (leadingGap ?? 0) > 0 ? {
49
- marginRight: leadingGap
50
- } : undefined],
51
- children: glyph.element
52
- }, glyph.id) : /*#__PURE__*/_jsx(Animated.Text, {
43
+ }) => {
44
+ // The leading token is always first. Keep it outside the text row so its
45
+ // appearance moves the text as one unit instead of reflowing every glyph.
46
+ const leadingGlyph = glyphs[0]?.kind === "element" ? glyphs[0] : undefined;
47
+ const textGlyphs = leadingGlyph ? glyphs.slice(1) : glyphs;
48
+ const shouldGroupText = Boolean(leadingGlyph) || Boolean(leadingLayoutTransition) || leadingLayoutGroup;
49
+ const renderTextGlyph = glyph => glyph.kind === "text" ? /*#__PURE__*/_jsx(Animated.Text, {
53
50
  layout: layoutTransition,
54
51
  entering: enterTransition,
55
52
  exiting: exitTransition,
56
53
  style: textStyle,
57
54
  className: className,
58
55
  children: glyph.value
59
- }, glyph.id))
60
- }));
56
+ }, glyph.id) : null;
57
+ const textRow = /*#__PURE__*/_jsx(Animated.View, {
58
+ layout: leadingLayoutTransition,
59
+ style: textRowStyle,
60
+ children: textGlyphs.map(renderTextGlyph)
61
+ }, "text-row");
62
+ return /*#__PURE__*/_jsxs(View, {
63
+ style: [rowStyle, rowAlignStyles[align]],
64
+ children: [leadingGlyph ? /*#__PURE__*/_jsx(Animated.View, {
65
+ // leading elements own their enter/exit geometry; generic layout
66
+ // motion here would compete with those transitions
67
+ layout: undefined,
68
+ entering: elementEnterTransition ?? enterTransition,
69
+ exiting: elementExitTransition ?? exitTransition,
70
+ style: [{
71
+ alignItems: "center",
72
+ justifyContent: "center"
73
+ }, (leadingGap ?? 0) > 0 ? {
74
+ marginRight: leadingGap
75
+ } : undefined],
76
+ children: leadingGlyph.element
77
+ }, leadingGlyph.id) : null, shouldGroupText ? textRow : textGlyphs.map(renderTextGlyph)]
78
+ });
79
+ });
61
80
  GlyphRun.displayName = "GlyphRun";
62
81
  //# sourceMappingURL=glyph-run.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["React","View","Animated","jsx","_jsx","rowStyle","flexDirection","alignItems","alignSelf","rowAlignStyles","left","center","right","GlyphRun","memo","glyphs","layoutTransition","enterTransition","elementEnterTransition","exitTransition","elementExitTransition","leadingGap","align","textStyle","className","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,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAyCC,IAAI,QAAQ,cAAc;AACnE,OAAOC,QAAQ,MAAM,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAO/C,MAAMC,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;AACA,OAAO,MAAMK,QAAQ,gBAAGb,KAAK,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;AACEpB,IAAA,CAACH,IAAI;EAACwB,KAAK,EAAE,CAACpB,QAAQ,EAAEI,cAAc,CAACa,KAAK,CAAC,CAAE;EAAAI,QAAA,EAE5CX,MAAM,CAACY,GAAG,CAAC,CAACC,KAAK,EAAEC,UAAU,KAC5BD,KAAK,CAACE,IAAI,KAAK,SAAS,gBACtB1B,IAAA,CAACF,QAAQ,CAACD,IAAI;IAEZ8B,MAAM,EAAEf,gBAAiB;IACzBgB,QAAQ,EAAEd,sBAAsB,IAAID,eAAgB;IACpDgB,OAAO,EAAEb,qBAAqB,IAAID,cAAe;IACjDM,KAAK,EAAE,CACL;MAAElB,UAAU,EAAE,QAAQ;MAAE2B,cAAc,EAAE;IAAS,CAAC,EAClDL,UAAU,KAAK,CAAC,IAAI,CAACR,UAAU,IAAI,CAAC,IAAI,CAAC,GACrC;MAAEc,WAAW,EAAEd;IAAW,CAAC,GAC3Be,SAAS,CACb;IAAAV,QAAA,EAEDE,KAAK,CAACS;EAAO,GAXTT,KAAK,CAACU,EAYE,CAAC,gBAEhBlC,IAAA,CAACF,QAAQ,CAACqC,IAAI;IAEZR,MAAM,EAAEf,gBAAiB;IACzBgB,QAAQ,EAAEf,eAAgB;IAC1BgB,OAAO,EAAEd,cAAe;IACxBM,KAAK,EAAEF,SAAU;IACjBC,SAAS,EAAEA,SAAU;IAAAE,QAAA,EAEpBE,KAAK,CAACY;EAAK,GAPPZ,KAAK,CAACU,EAQE,CAEnB;AAAC,CACG,CAEZ,CAAC;AAEDzB,QAAQ,CAAC4B,WAAW,GAAG,UAAU","ignoreList":[]}
1
+ {"version":3,"names":["React","View","Animated","jsx","_jsx","jsxs","_jsxs","rowStyle","flexDirection","alignItems","alignSelf","textRowStyle","rowAlignStyles","left","center","right","GlyphRun","memo","glyphs","layoutTransition","leadingLayoutTransition","leadingLayoutGroup","enterTransition","elementEnterTransition","exitTransition","elementExitTransition","leadingGap","align","textStyle","className","leadingGlyph","kind","undefined","textGlyphs","slice","shouldGroupText","Boolean","renderTextGlyph","glyph","Text","layout","entering","exiting","style","children","value","id","textRow","map","justifyContent","marginRight","element","displayName"],"sourceRoot":"../../../src","sources":["view/glyph-run.tsx"],"mappings":"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","ignoreList":[]}
@@ -12,6 +12,7 @@ export const TextRun = /*#__PURE__*/React.memo(({
12
12
  motionRecipe,
13
13
  align,
14
14
  leading,
15
+ leadingLayoutGroup = false,
15
16
  leadingKey,
16
17
  leadingGap = 0,
17
18
  ready = true,
@@ -42,6 +43,7 @@ export const TextRun = /*#__PURE__*/React.memo(({
42
43
  const lastLeadingKeyRef = useRef(visibleLeadingKey);
43
44
  const hasAnimatedRef = useRef(false);
44
45
  const isLeadingSwap = Boolean(visibleLeading) && lastLeadingPresenceRef.current && visibleLeadingKey !== lastLeadingKeyRef.current;
46
+ const isLeadingChange = Boolean(visibleLeading) !== lastLeadingPresenceRef.current || Boolean(visibleLeading) && visibleLeadingKey !== lastLeadingKeyRef.current;
45
47
  // update the worklet flag after commit so render never writes a shared value
46
48
  const leadingSwapProgress = useSharedValue(0);
47
49
  useLayoutEffect(() => {
@@ -70,6 +72,8 @@ export const TextRun = /*#__PURE__*/React.memo(({
70
72
  return /*#__PURE__*/_jsx(GlyphRun, {
71
73
  glyphs: glyphs,
72
74
  layoutTransition: hasAnimated ? motionRecipe.layoutTransition : undefined,
75
+ leadingLayoutTransition: isLeadingChange ? motionRecipe.layoutTransition : undefined,
76
+ leadingLayoutGroup: leadingLayoutGroup,
73
77
  enterTransition: hasAnimatedRef.current ? motionRecipe.enterTransition : undefined,
74
78
  elementEnterTransition: isLeadingSwap ? elementEnterTransition : undefined,
75
79
  exitTransition: motionRecipe.exitTransition,
@@ -1 +1 @@
1
- {"version":3,"names":["React","useId","useLayoutEffect","useMemo","useRef","useSharedValue","useTextGlyphs","createLeadingEnterTransition","createLeadingExitTransition","GlyphRun","jsx","_jsx","TextRun","memo","value","motionRecipe","align","leading","leadingKey","leadingGap","ready","textStyle","className","scopeId","hasDisplayedRef","displayedValueRef","displayedLeadingRef","displayedLeadingKeyRef","displayedLeadingGapRef","shouldDisplayTarget","current","visibleValue","visibleLeading","visibleLeadingKey","visibleLeadingGap","lastValueRef","lastLeadingPresenceRef","Boolean","lastLeadingKeyRef","hasAnimatedRef","isLeadingSwap","leadingSwapProgress","glyphs","elementEnterTransition","durationMs","easing","elementExitTransition","scale","hasAnimated","layoutTransition","undefined","enterTransition","exitTransition","displayName"],"sourceRoot":"../../../src","sources":["view/text-run.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["React","useId","useLayoutEffect","useMemo","useRef","useSharedValue","useTextGlyphs","createLeadingEnterTransition","createLeadingExitTransition","GlyphRun","jsx","_jsx","TextRun","memo","value","motionRecipe","align","leading","leadingLayoutGroup","leadingKey","leadingGap","ready","textStyle","className","scopeId","hasDisplayedRef","displayedValueRef","displayedLeadingRef","displayedLeadingKeyRef","displayedLeadingGapRef","shouldDisplayTarget","current","visibleValue","visibleLeading","visibleLeadingKey","visibleLeadingGap","lastValueRef","lastLeadingPresenceRef","Boolean","lastLeadingKeyRef","hasAnimatedRef","isLeadingSwap","isLeadingChange","leadingSwapProgress","glyphs","elementEnterTransition","durationMs","easing","elementExitTransition","scale","hasAnimated","layoutTransition","undefined","leadingLayoutTransition","enterTransition","exitTransition","displayName"],"sourceRoot":"../../../src","sources":["view/text-run.tsx"],"mappings":"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","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"use-text-glyphs.d.ts","sourceRoot":"","sources":["../../../../src/hooks/use-text-glyphs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAMxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAc3C,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,EACb,WAAW,MAAM,EACjB,UAAU,SAAS,EACnB,aAAa,MAAM,GAAG,MAAM,KAC3B,SAAS,UAAU,EAoErB,CAAC"}
1
+ {"version":3,"file":"use-text-glyphs.d.ts","sourceRoot":"","sources":["../../../../src/hooks/use-text-glyphs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAMxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAgB3C,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,EACb,WAAW,MAAM,EACjB,UAAU,SAAS,EACnB,aAAa,MAAM,GAAG,MAAM,KAC3B,SAAS,UAAU,EAyErB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,KAAK,EAAqB,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAOpE,eAAO,MAAM,OAAO,yDA8JhB,CAAC;AAcL,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,wBAAwB,EACxB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,SAAS,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,KAAK,EAAqB,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAOpE,eAAO,MAAM,OAAO,yDA+JhB,CAAC;AAcL,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,wBAAwB,EACxB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,SAAS,CAAC"}
@@ -2,9 +2,11 @@ import React from "react";
2
2
  import { type StyleProp, type TextStyle } from "react-native";
3
3
  import type { ComplexAnimationBuilder, EntryExitAnimationFunction } from "react-native-reanimated";
4
4
  import type { GlyphToken, LaminarAlign } from "../types";
5
- export declare const GlyphRun: React.MemoExoticComponent<({ glyphs, layoutTransition, enterTransition, elementEnterTransition, exitTransition, elementExitTransition, leadingGap, align, textStyle, className, }: Readonly<{
5
+ export declare const GlyphRun: React.MemoExoticComponent<({ glyphs, layoutTransition, leadingLayoutTransition, leadingLayoutGroup, enterTransition, elementEnterTransition, exitTransition, elementExitTransition, leadingGap, align, textStyle, className, }: Readonly<{
6
6
  glyphs: readonly GlyphToken[];
7
7
  layoutTransition?: ComplexAnimationBuilder;
8
+ leadingLayoutTransition?: ComplexAnimationBuilder;
9
+ leadingLayoutGroup?: boolean;
8
10
  enterTransition?: EntryExitAnimationFunction;
9
11
  elementEnterTransition?: EntryExitAnimationFunction;
10
12
  exitTransition?: EntryExitAnimationFunction;
@@ -1 +1 @@
1
- {"version":3,"file":"glyph-run.d.ts","sourceRoot":"","sources":["../../../../src/view/glyph-run.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAQ,MAAM,cAAc,CAAC;AAEpE,OAAO,KAAK,EACV,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAezD,eAAO,MAAM,QAAQ,qLAYhB,QAAQ,CAAC;IACV,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IAC9B,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;IAC3C,eAAe,CAAC,EAAE,0BAA0B,CAAC;IAC7C,sBAAsB,CAAC,EAAE,0BAA0B,CAAC;IACpD,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAC5C,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,uBAmCH,CAAC"}
1
+ {"version":3,"file":"glyph-run.d.ts","sourceRoot":"","sources":["../../../../src/view/glyph-run.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAQ,MAAM,cAAc,CAAC;AAEpE,OAAO,KAAK,EACV,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAqBzD,eAAO,MAAM,QAAQ,kOAchB,QAAQ,CAAC;IACV,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IAC9B,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;IAC3C,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,0BAA0B,CAAC;IAC7C,sBAAsB,CAAC,EAAE,0BAA0B,CAAC;IACpD,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAC5C,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,uBAsDH,CAAC"}
@@ -7,12 +7,13 @@ type TextRunProps = {
7
7
  readonly motionRecipe: MotionRecipe;
8
8
  readonly align: LaminarAlign;
9
9
  readonly leading?: ReactNode;
10
+ readonly leadingLayoutGroup?: boolean;
10
11
  readonly leadingKey?: string | number;
11
12
  readonly leadingGap?: number;
12
13
  readonly ready?: boolean;
13
14
  readonly textStyle?: StyleProp<TextStyle>;
14
15
  readonly className?: string;
15
16
  };
16
- export declare const TextRun: React.MemoExoticComponent<({ value, motionRecipe, align, leading, leadingKey, leadingGap, ready, textStyle, className, }: TextRunProps) => React.JSX.Element>;
17
+ export declare const TextRun: React.MemoExoticComponent<({ value, motionRecipe, align, leading, leadingLayoutGroup, leadingKey, leadingGap, ready, textStyle, className, }: TextRunProps) => React.JSX.Element>;
17
18
  export {};
18
19
  //# sourceMappingURL=text-run.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"text-run.d.ts","sourceRoot":"","sources":["../../../../src/view/text-run.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAG3D,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC1C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAGF,eAAO,MAAM,OAAO,4HAWf,YAAY,uBA8GhB,CAAC"}
1
+ {"version":3,"file":"text-run.d.ts","sourceRoot":"","sources":["../../../../src/view/text-run.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAG3D,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC1C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAGF,eAAO,MAAM,OAAO,gJAYf,YAAY,uBAsHhB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"use-text-glyphs.d.ts","sourceRoot":"","sources":["../../../../src/hooks/use-text-glyphs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAMxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAc3C,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,EACb,WAAW,MAAM,EACjB,UAAU,SAAS,EACnB,aAAa,MAAM,GAAG,MAAM,KAC3B,SAAS,UAAU,EAoErB,CAAC"}
1
+ {"version":3,"file":"use-text-glyphs.d.ts","sourceRoot":"","sources":["../../../../src/hooks/use-text-glyphs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAMxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAgB3C,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,EACb,WAAW,MAAM,EACjB,UAAU,SAAS,EACnB,aAAa,MAAM,GAAG,MAAM,KAC3B,SAAS,UAAU,EAyErB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,KAAK,EAAqB,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAOpE,eAAO,MAAM,OAAO,yDA8JhB,CAAC;AAcL,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,wBAAwB,EACxB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,SAAS,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,KAAK,EAAqB,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAOpE,eAAO,MAAM,OAAO,yDA+JhB,CAAC;AAcL,YAAY,EACV,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,wBAAwB,EACxB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,SAAS,CAAC"}
@@ -2,9 +2,11 @@ import React from "react";
2
2
  import { type StyleProp, type TextStyle } from "react-native";
3
3
  import type { ComplexAnimationBuilder, EntryExitAnimationFunction } from "react-native-reanimated";
4
4
  import type { GlyphToken, LaminarAlign } from "../types";
5
- export declare const GlyphRun: React.MemoExoticComponent<({ glyphs, layoutTransition, enterTransition, elementEnterTransition, exitTransition, elementExitTransition, leadingGap, align, textStyle, className, }: Readonly<{
5
+ export declare const GlyphRun: React.MemoExoticComponent<({ glyphs, layoutTransition, leadingLayoutTransition, leadingLayoutGroup, enterTransition, elementEnterTransition, exitTransition, elementExitTransition, leadingGap, align, textStyle, className, }: Readonly<{
6
6
  glyphs: readonly GlyphToken[];
7
7
  layoutTransition?: ComplexAnimationBuilder;
8
+ leadingLayoutTransition?: ComplexAnimationBuilder;
9
+ leadingLayoutGroup?: boolean;
8
10
  enterTransition?: EntryExitAnimationFunction;
9
11
  elementEnterTransition?: EntryExitAnimationFunction;
10
12
  exitTransition?: EntryExitAnimationFunction;
@@ -1 +1 @@
1
- {"version":3,"file":"glyph-run.d.ts","sourceRoot":"","sources":["../../../../src/view/glyph-run.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAQ,MAAM,cAAc,CAAC;AAEpE,OAAO,KAAK,EACV,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAezD,eAAO,MAAM,QAAQ,qLAYhB,QAAQ,CAAC;IACV,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IAC9B,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;IAC3C,eAAe,CAAC,EAAE,0BAA0B,CAAC;IAC7C,sBAAsB,CAAC,EAAE,0BAA0B,CAAC;IACpD,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAC5C,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,uBAmCH,CAAC"}
1
+ {"version":3,"file":"glyph-run.d.ts","sourceRoot":"","sources":["../../../../src/view/glyph-run.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAQ,MAAM,cAAc,CAAC;AAEpE,OAAO,KAAK,EACV,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAqBzD,eAAO,MAAM,QAAQ,kOAchB,QAAQ,CAAC;IACV,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IAC9B,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;IAC3C,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,0BAA0B,CAAC;IAC7C,sBAAsB,CAAC,EAAE,0BAA0B,CAAC;IACpD,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAC5C,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,uBAsDH,CAAC"}
@@ -7,12 +7,13 @@ type TextRunProps = {
7
7
  readonly motionRecipe: MotionRecipe;
8
8
  readonly align: LaminarAlign;
9
9
  readonly leading?: ReactNode;
10
+ readonly leadingLayoutGroup?: boolean;
10
11
  readonly leadingKey?: string | number;
11
12
  readonly leadingGap?: number;
12
13
  readonly ready?: boolean;
13
14
  readonly textStyle?: StyleProp<TextStyle>;
14
15
  readonly className?: string;
15
16
  };
16
- export declare const TextRun: React.MemoExoticComponent<({ value, motionRecipe, align, leading, leadingKey, leadingGap, ready, textStyle, className, }: TextRunProps) => React.JSX.Element>;
17
+ export declare const TextRun: React.MemoExoticComponent<({ value, motionRecipe, align, leading, leadingLayoutGroup, leadingKey, leadingGap, ready, textStyle, className, }: TextRunProps) => React.JSX.Element>;
17
18
  export {};
18
19
  //# sourceMappingURL=text-run.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"text-run.d.ts","sourceRoot":"","sources":["../../../../src/view/text-run.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAG3D,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC1C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAGF,eAAO,MAAM,OAAO,4HAWf,YAAY,uBA8GhB,CAAC"}
1
+ {"version":3,"file":"text-run.d.ts","sourceRoot":"","sources":["../../../../src/view/text-run.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAG3D,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC1C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAGF,eAAO,MAAM,OAAO,gJAYf,YAAY,uBAsHhB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-laminar",
3
- "version": "1.4.3",
3
+ "version": "1.4.4",
4
4
  "description": "A React Native component for morphing text and numbers with character-level identity.",
5
5
  "keywords": [
6
6
  "react-native",
@@ -13,43 +13,37 @@ type TextGlyphLedger = {
13
13
  nextSeed: number;
14
14
  };
15
15
 
16
- type TextGlyphUnit =
17
- | { readonly kind: "text"; readonly signature: string; readonly value: string }
18
- | { readonly kind: "element"; readonly signature: string; readonly element: ReactNode };
16
+ type TextGlyphUnit = {
17
+ readonly kind: "text";
18
+ readonly signature: string;
19
+ readonly value: string;
20
+ };
19
21
 
20
- // build the inline token stream that lets text and leading content share one ledger
22
+ // build text glyphs independently, then prepend a separately keyed leading token
21
23
  export const useTextGlyphs = (
22
24
  value: string,
23
25
  namespace: string,
24
26
  leading?: ReactNode,
25
27
  leadingKey?: string | number
26
28
  ): readonly GlyphToken[] => {
27
- const units = useMemo<readonly TextGlyphUnit[]>(
29
+ // Reconcile text independently so inserting/removing a leading token cannot
30
+ // change which repeated text glyphs the LCS ledger preserves.
31
+ const textUnits = useMemo<readonly TextGlyphUnit[]>(
28
32
  () => [
29
- // the map key becomes the identity when leading content is state keyed
30
- ...(leading
31
- ? [
32
- {
33
- kind: "element",
34
- signature: `leading:${String(leadingKey ?? "default")}`,
35
- element: leading,
36
- } as const,
37
- ]
38
- : []),
39
33
  ...splitDisplayUnits(value).map((unit) => ({
40
34
  kind: "text" as const,
41
35
  signature: `text:${unit}`,
42
36
  value: unit,
43
37
  })),
44
38
  ],
45
- [leading, leadingKey, value]
39
+ [value]
46
40
  );
47
- const signatures = units.map((unit) => unit.signature);
41
+ const signatures = textUnits.map((unit) => unit.signature);
48
42
  const ledgerRef = useRef<TextGlyphLedger>({
49
43
  previousValue: value,
50
44
  previousSignatures: signatures,
51
- glyphKeys: units.map((_, index) => `${namespace}:c${index}`),
52
- nextSeed: units.length,
45
+ glyphKeys: textUnits.map((_, index) => `${namespace}:c${index}`),
46
+ nextSeed: textUnits.length,
53
47
  });
54
48
 
55
49
  // reconcile only when a token signature changes so stable glyphs keep their views
@@ -79,16 +73,29 @@ export const useTextGlyphs = (
79
73
 
80
74
  const glyphKeys = ledgerRef.current.glyphKeys;
81
75
 
82
- // normalize spaces at the edge where tokens become renderable glyphs
76
+ // normalize spaces at the edge where tokens become renderable glyphs, then
77
+ // prepend the leading token with an identity that is independent of text
83
78
  return useMemo(
84
- () =>
85
- units.map((unit, index) => ({
79
+ () => {
80
+ const textGlyphs = textUnits.map((unit, index) => ({
86
81
  id: glyphKeys[index],
87
- kind: unit.kind,
88
- ...(unit.kind === "text"
89
- ? { value: normalizeDisplayUnit(unit.value) }
90
- : { element: unit.element }),
91
- })),
92
- [glyphKeys, units]
82
+ kind: "text" as const,
83
+ value: normalizeDisplayUnit(unit.value),
84
+ }));
85
+
86
+ if (!leading) {
87
+ return textGlyphs;
88
+ }
89
+
90
+ return [
91
+ {
92
+ id: `${namespace}:leading:${String(leadingKey ?? "default")}`,
93
+ kind: "element" as const,
94
+ element: leading,
95
+ },
96
+ ...textGlyphs,
97
+ ];
98
+ },
99
+ [glyphKeys, leading, leadingKey, namespace, textUnits]
93
100
  );
94
101
  };
package/src/index.tsx CHANGED
@@ -163,6 +163,7 @@ export const Laminar = React.memo(function Laminar({
163
163
  motionRecipe={motionRecipe}
164
164
  align={align}
165
165
  leading={resolvedLeading}
166
+ leadingLayoutGroup={Boolean(leading)}
166
167
  leadingKey={resolvedLeadingKey}
167
168
  leadingGap={leadingGap}
168
169
  ready={!autoSize || isAutoSizeReady}
@@ -13,6 +13,12 @@ const rowStyle = {
13
13
  alignSelf: "flex-start",
14
14
  } as const;
15
15
 
16
+ const textRowStyle = {
17
+ flexDirection: "row",
18
+ alignItems: "center",
19
+ alignSelf: "flex-start",
20
+ } as const;
21
+
16
22
  const rowAlignStyles = {
17
23
  left: { alignSelf: "flex-start" },
18
24
  center: { alignSelf: "center" },
@@ -24,6 +30,8 @@ export const GlyphRun = React.memo(
24
30
  ({
25
31
  glyphs,
26
32
  layoutTransition,
33
+ leadingLayoutTransition,
34
+ leadingLayoutGroup = false,
27
35
  enterTransition,
28
36
  elementEnterTransition,
29
37
  exitTransition,
@@ -35,6 +43,8 @@ export const GlyphRun = React.memo(
35
43
  }: Readonly<{
36
44
  glyphs: readonly GlyphToken[];
37
45
  layoutTransition?: ComplexAnimationBuilder;
46
+ leadingLayoutTransition?: ComplexAnimationBuilder;
47
+ leadingLayoutGroup?: boolean;
38
48
  enterTransition?: EntryExitAnimationFunction;
39
49
  elementEnterTransition?: EntryExitAnimationFunction;
40
50
  exitTransition?: EntryExitAnimationFunction;
@@ -43,41 +53,60 @@ export const GlyphRun = React.memo(
43
53
  align: LaminarAlign;
44
54
  textStyle?: StyleProp<TextStyle>;
45
55
  className?: string;
46
- }>) => (
47
- // each token keeps its own view so reanimated can animate only changed content
56
+ }>) => {
57
+ // The leading token is always first. Keep it outside the text row so its
58
+ // appearance moves the text as one unit instead of reflowing every glyph.
59
+ const leadingGlyph = glyphs[0]?.kind === "element" ? glyphs[0] : undefined;
60
+ const textGlyphs = leadingGlyph ? glyphs.slice(1) : glyphs;
61
+ const shouldGroupText =
62
+ Boolean(leadingGlyph) || Boolean(leadingLayoutTransition) || leadingLayoutGroup;
63
+
64
+ const renderTextGlyph = (glyph: GlyphToken) =>
65
+ glyph.kind === "text" ? (
66
+ <Animated.Text
67
+ key={glyph.id}
68
+ layout={layoutTransition}
69
+ entering={enterTransition}
70
+ exiting={exitTransition}
71
+ style={textStyle}
72
+ className={className}
73
+ >
74
+ {glyph.value}
75
+ </Animated.Text>
76
+ ) : null;
77
+
78
+ const textRow = (
79
+ <Animated.View
80
+ key="text-row"
81
+ layout={leadingLayoutTransition}
82
+ style={textRowStyle}
83
+ >
84
+ {textGlyphs.map(renderTextGlyph)}
85
+ </Animated.View>
86
+ );
87
+
88
+ return (
48
89
  <View style={[rowStyle, rowAlignStyles[align]]}>
49
- {/* glyph ids decide what swaps, layout handles the row reflow */}
50
- {glyphs.map((glyph, glyphIndex) =>
51
- glyph.kind === "element" ? (
52
- <Animated.View
53
- key={glyph.id}
54
- layout={layoutTransition}
55
- entering={elementEnterTransition ?? enterTransition}
56
- exiting={elementExitTransition ?? exitTransition}
57
- style={[
58
- { alignItems: "center", justifyContent: "center" },
59
- glyphIndex === 0 && (leadingGap ?? 0) > 0
60
- ? { marginRight: leadingGap }
61
- : undefined,
62
- ]}
63
- >
64
- {glyph.element}
65
- </Animated.View>
66
- ) : (
67
- <Animated.Text
68
- key={glyph.id}
69
- layout={layoutTransition}
70
- entering={enterTransition}
71
- exiting={exitTransition}
72
- style={textStyle}
73
- className={className}
74
- >
75
- {glyph.value}
76
- </Animated.Text>
77
- )
78
- )}
90
+ {leadingGlyph ? (
91
+ <Animated.View
92
+ key={leadingGlyph.id}
93
+ // leading elements own their enter/exit geometry; generic layout
94
+ // motion here would compete with those transitions
95
+ layout={undefined}
96
+ entering={elementEnterTransition ?? enterTransition}
97
+ exiting={elementExitTransition ?? exitTransition}
98
+ style={[
99
+ { alignItems: "center", justifyContent: "center" },
100
+ (leadingGap ?? 0) > 0 ? { marginRight: leadingGap } : undefined,
101
+ ]}
102
+ >
103
+ {leadingGlyph.element}
104
+ </Animated.View>
105
+ ) : null}
106
+ {shouldGroupText ? textRow : textGlyphs.map(renderTextGlyph)}
79
107
  </View>
80
- )
108
+ );
109
+ }
81
110
  );
82
111
 
83
112
  GlyphRun.displayName = "GlyphRun";
@@ -15,6 +15,7 @@ type TextRunProps = {
15
15
  readonly motionRecipe: MotionRecipe;
16
16
  readonly align: LaminarAlign;
17
17
  readonly leading?: ReactNode;
18
+ readonly leadingLayoutGroup?: boolean;
18
19
  readonly leadingKey?: string | number;
19
20
  readonly leadingGap?: number;
20
21
  readonly ready?: boolean;
@@ -29,6 +30,7 @@ export const TextRun = React.memo(
29
30
  motionRecipe,
30
31
  align,
31
32
  leading,
33
+ leadingLayoutGroup = false,
32
34
  leadingKey,
33
35
  leadingGap = 0,
34
36
  ready = true,
@@ -72,6 +74,10 @@ export const TextRun = React.memo(
72
74
  Boolean(visibleLeading) &&
73
75
  lastLeadingPresenceRef.current &&
74
76
  visibleLeadingKey !== lastLeadingKeyRef.current;
77
+ const isLeadingChange =
78
+ Boolean(visibleLeading) !== lastLeadingPresenceRef.current ||
79
+ (Boolean(visibleLeading) &&
80
+ visibleLeadingKey !== lastLeadingKeyRef.current);
75
81
  // update the worklet flag after commit so render never writes a shared value
76
82
  const leadingSwapProgress = useSharedValue(0);
77
83
  useLayoutEffect(() => {
@@ -127,6 +133,10 @@ export const TextRun = React.memo(
127
133
  layoutTransition={
128
134
  hasAnimated ? motionRecipe.layoutTransition : undefined
129
135
  }
136
+ leadingLayoutTransition={
137
+ isLeadingChange ? motionRecipe.layoutTransition : undefined
138
+ }
139
+ leadingLayoutGroup={leadingLayoutGroup}
130
140
  enterTransition={
131
141
  hasAnimatedRef.current
132
142
  ? motionRecipe.enterTransition