@grahlnn/comps 0.1.0 → 0.1.2

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";
@@ -3043,12 +3067,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";
   }
@@ -3083,7 +3111,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 +3129,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 +3203,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;
       }
@@ -3596,7 +3638,10 @@ function getRootStyle(stage, plan, measurement, layoutContext) {
       width = plan.layoutInlineSizeFrom;
     }
   }
-  const height = plan?.frameHeight ?? measurement?.snapshot.height;
+  let height;
+  if (plan !== null) {
+    height = plan.frameHeight;
+  }
   const shouldTransitionWidth = stage === "animate" && plan !== null && !nearlyEqual(plan.layoutInlineSizeFrom, plan.layoutInlineSizeTo);
   const style = {
     position: "relative",

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.0",
+  "version": "0.1.2",
   "description": "React components from grahlnn/comps.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -22,6 +22,7 @@
     "build": "bun run build:js && bun run build:types",
     "build:js": "bun build ./index.ts --outdir ./dist --format esm --target browser --external react --external react/jsx-runtime",
     "build:types": "tsc -p tsconfig.build.json",
+    "test:vendor-pretext": "bun test vendor-sync/pretext/layout.test.ts",
     "prepublishOnly": "bun run build"
   },
   "publishConfig": {

package/torph/src/vendor/pretext/NOTICE.md

@@ -1,11 +1,24 @@
-Vendored from `C:\Users\admin\pretext` under the MIT license.
-
-Upstream files copied here:
-- `src/analysis.ts`
-- `src/bidi.ts`
-- `src/layout.ts`
-- `src/line-break.ts`
-- `src/measurement.ts`
-
-Local project code should import through `src/utils/text-layout/pretext.ts`
-instead of importing these vendor files directly.
+Vendored from `C:\Users\admin\pretext` under the MIT license.
+
+Current upstream sync baseline:
+- repo: `@chenglou/pretext`
+- commit: `488d8c6`
+
+Upstream runtime files copied here:
+- `src/analysis.ts`
+- `src/bidi.ts`
+- `src/layout.ts`
+- `src/line-break.ts`
+- `src/measurement.ts`
+
+Local compatibility patch:
+- `analysis.ts` keeps `export function normalizeWhitespacePreWrap(...)`
+  because `torph/src/utils/text-layout/pretextMorph.ts` imports it directly.
+
+Vendor sync guardrails live under `vendor-sync/pretext/`:
+- `layout.test.ts`
+- `test-data.ts`
+
+Local project code should import through `torph/src/utils/text-layout/pretext.ts`
+instead of importing these vendor files directly, except for the intentional
+internal use in `pretextMorph.ts`.