@grahlnn/comps 0.1.1 → 0.1.3

package/dist/index.js

@@ -2355,7 +2355,13 @@ function hasUnsupportedPretextMorphFeatures(text, layoutContext) {
   return false;
 }
 function shouldProbePretextMorph(text, layoutContext) {
-  return PROBE_COMPLEX_WHITESPACE_RE.test(text) || PROBE_SYSTEM_UI_RE.test(layoutContext.font);
+  if (layoutContext.whiteSpace !== "nowrap") {
+    return true;
+  }
+  if (PROBE_COMPLEX_WHITESPACE_RE.test(text)) {
+    return true;
+  }
+  return PROBE_SYSTEM_UI_RE.test(layoutContext.font);
 }
 function getPretextMorphRenderedText(text, layoutContext) {
   if (layoutContext === null) {
@@ -2383,6 +2389,24 @@ function getPretextMorphStyleSignature(layoutContext) {
     engineProfile.preferEarlySoftHyphenBreak ? "1" : "0"
   ].join("\x00");
 }
+function getPretextMorphTrustSignature({
+  renderText,
+  layoutContext,
+  useContentInlineSize
+}) {
+  if (layoutContext === null) {
+    return null;
+  }
+  const styleSignature = getPretextMorphStyleSignature(layoutContext);
+  if (styleSignature === null) {
+    return null;
+  }
+  let inlineSizeSignature = layoutContext.width.toFixed(2);
+  if (useContentInlineSize) {
+    inlineSizeSignature = "content";
+  }
+  return [styleSignature, inlineSizeSignature, renderText].join("\x00");
+}
 function getPretextMorphMeasurementBackend(text, layoutContext) {
   if (layoutContext === null) {
     return "dom";
@@ -2499,6 +2523,7 @@ var MORPH = {
   maxFadeMs: 150,
   ease: "cubic-bezier(0.22, 1, 0.36, 1)",
   geometryEpsilon: 0.5,
+  contentWidthLockEpsilon: 2,
   lineGroupingEpsilon: 1
 };
 var MORPH_SEGMENT_CACHE_LIMIT = 256;
@@ -3043,12 +3068,16 @@ function readRootOrigin(node) {
   const rect = node.getBoundingClientRect();
   return { left: rect.left, top: rect.top };
 }
-function getTrustedPretextMeasurementBackend(text, layoutContext) {
+function getTrustedPretextMeasurementBackend(text, renderText, layoutContext, useContentInlineSize) {
   const backend = getPretextMorphMeasurementBackend(text, layoutContext);
   if (backend !== "probe") {
     return backend;
   }
-  const signature = getPretextMorphStyleSignature(layoutContext);
+  const signature = getPretextMorphTrustSignature({
+    renderText,
+    layoutContext,
+    useContentInlineSize
+  });
   if (signature === null) {
     return "dom";
   }
@@ -3071,7 +3100,7 @@ function shouldMeasureUsingContentInlineSize(layoutContext, layoutHint) {
   if (layoutHint === null || !isSingleLineSnapshot(layoutHint.snapshot)) {
     return false;
   }
-  return nearlyEqual(layoutHint.layoutInlineSize, layoutHint.snapshot.width);
+  return nearlyEqual(layoutHint.layoutInlineSize, layoutHint.snapshot.width, MORPH.contentWidthLockEpsilon);
 }
 function createMorphMeasurementRequest({
   text,
@@ -3083,7 +3112,7 @@ function createMorphMeasurementRequest({
   }
   const renderText = getPretextMorphRenderedText(text, layoutContext);
   const useContentInlineSize = shouldMeasureUsingContentInlineSize(layoutContext, layoutHint);
-  const measurementBackend = getTrustedPretextMeasurementBackend(text, layoutContext);
+  const measurementBackend = getTrustedPretextMeasurementBackend(text, renderText, layoutContext, useContentInlineSize);
   let segments = readCachedMorphSegments(renderText);
   if (measurementBackend === "pretext") {
     segments = EMPTY_SEGMENTS;
@@ -3101,8 +3130,17 @@ function createMorphMeasurementRequest({
     domMeasurementKey
   };
 }
-function rememberPretextMeasurementTrust(layoutContext, trusted) {
-  const signature = getPretextMorphStyleSignature(layoutContext);
+function rememberPretextMeasurementTrust({
+  renderText,
+  layoutContext,
+  useContentInlineSize,
+  trusted
+}) {
+  const signature = getPretextMorphTrustSignature({
+    renderText,
+    layoutContext,
+    useContentInlineSize
+  });
   if (signature === null) {
     return;
   }
@@ -3166,7 +3204,12 @@ function measureFromNodes({
     }
     if (measurementBackend === "probe" && pretextSnapshot !== null && domSnapshot !== null) {
       const trusted = areSnapshotsEquivalentForPretextTrust(pretextSnapshot, domSnapshot);
-      rememberPretextMeasurementTrust(layoutContext, trusted);
+      rememberPretextMeasurementTrust({
+        renderText,
+        layoutContext,
+        useContentInlineSize,
+        trusted
+      });
       if (trusted) {
         return pretextSnapshot;
       }
@@ -3381,10 +3424,18 @@ function resetMorph(session, timeline, setState) {
   setState(EMPTY_STATE);
 }
 function commitStaticMeasurement(session, measurement, setState) {
+  if (!session.animating && session.target === null && session.committed !== null && sameMeasurement(session.committed, measurement)) {
+    return;
+  }
   session.committed = measurement;
   session.target = null;
   session.animating = false;
-  setState(createStaticState(measurement));
+  setState((current) => {
+    if (current.stage === "idle" && current.plan === null && current.measurement !== null && sameMeasurement(current.measurement, measurement)) {
+      return current;
+    }
+    return createStaticState(measurement);
+  });
 }
 function scheduleMorphTimeline({
   session,

package/dist/torph/src/utils/text-layout/pretextMorph.d.ts

@@ -32,6 +32,11 @@ export type PretextMorphSnapshot = {
 export declare function clearPretextMorphCaches(): void;
 export declare function getPretextMorphRenderedText(text: string, layoutContext: Pick<PretextMorphLayoutContext, "whiteSpace"> | null): string;
 export declare function getPretextMorphStyleSignature(layoutContext: PretextMorphLayoutContext | null): string | null;
+export declare function getPretextMorphTrustSignature({ renderText, layoutContext, useContentInlineSize, }: {
+    renderText: string;
+    layoutContext: PretextMorphLayoutContext | null;
+    useContentInlineSize: boolean;
+}): string | null;
 export declare function getPretextMorphMeasurementBackend(text: string, layoutContext: PretextMorphLayoutContext | null): PretextMorphMeasurementBackend;
 export declare function canUsePretextMorphFastPath(text: string, layoutContext: PretextMorphLayoutContext | null): boolean;
 export declare function measureMorphSnapshotWithPretext(text: string, layoutContext: PretextMorphLayoutContext): PretextMorphSnapshot;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grahlnn/comps",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "React components from grahlnn/comps.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",