@rowsncolumns/spreadsheet 10.6.0 → 10.6.5

package/dist/cjs/components/cell/cell-text-runs.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importStar(require("react"));
 var react_konva_1 = require("react-konva");
 var themes_1 = require("../../themes");
+var alignment_1 = require("./alignment");
 var line_height_1 = require("./line-height");
 var rich_text_1 = require("./rich-text");
 var BASELINE_OFFSET_FONT_SCALE = 0.58;
@@ -45,13 +46,12 @@ var buildFontString = function (r) {
  * merged style carries a `baselineOffset` (own or inherited from the
  * base) the sup/sub font scale is applied here, exactly once.
  */
-var resolveSegmentStyle = function (seg, base, theme) {
+var resolveSegmentStyle = function (seg, base, theme, fontScale) {
     var _a, _b, _c, _d, _e, _f;
+    if (fontScale === void 0) { fontScale = 1; }
     var f = seg.format;
     var baselineOffset = (_a = f.baselineOffset) !== null && _a !== void 0 ? _a : base.baselineOffset;
-    var fontSize = typeof f.fontSize === "number"
-        ? (f.fontSize / pointFromPx(base.fontSize)) * base.fontSize
-        : base.fontSize;
+    var fontSize = typeof f.fontSize === "number" ? f.fontSize * PT_TO_PX * fontScale : base.fontSize;
     return {
         bold: (_b = f.bold) !== null && _b !== void 0 ? _b : base.bold,
         italic: (_c = f.italic) !== null && _c !== void 0 ? _c : base.italic,
@@ -60,7 +60,7 @@ var resolveSegmentStyle = function (seg, base, theme) {
         color: f.color != null
             ? (0, themes_1.getStringifiedColor)(f.color, theme) || base.color
             : base.color,
-        fontFamily: (_f = f.fontFamily) !== null && _f !== void 0 ? _f : base.fontFamily,
+        fontFamily: (_f = (0, themes_1.resolveThemeFontFamily)(f.fontFamily, theme)) !== null && _f !== void 0 ? _f : base.fontFamily,
         // f.fontSize is in points to mirror the editor's TextFormat type,
         // but at this paint layer everything is in pixels — scale ratio is
         // applied by the caller via baseFontSize. For per-segment override
@@ -72,8 +72,8 @@ var resolveSegmentStyle = function (seg, base, theme) {
     };
 };
 exports.resolveSegmentStyle = resolveSegmentStyle;
-/** Inverse of pointToPixel — used only when computing a per-segment scale. */
-var pointFromPx = function (px) { return px / 1.3333; };
+/** CSS pixels per point (96 / 72), as `pointToPixel`. */
+var PT_TO_PX = 96 / 72;
 /**
  * Fraction of the em box above the alphabetic baseline for typical
  * Latin fonts. Used to baseline-align mixed-size runs on one line:
@@ -108,18 +108,15 @@ var computeLineMetrics = function (resolvedLines, base, advanceOf) {
 exports.computeLineMetrics = computeLineMetrics;
 /**
  * Vertical draw position (textBaseline="top") for one segment within
- * its line box. Normal runs share the line's alphabetic baseline
- * (smaller runs shift down), superscript hugs the line top, subscript
- * hugs the line bottom. All three reduce to `lineTop` when the run's
- * size equals the line's. Exported for unit tests.
+ * its line box. Every run shares the line's alphabetic baseline (smaller
+ * runs shift down); superscript / subscript runs then move that baseline
+ * up / down by Excel's shift ({@link getScriptBaselineShift}). Exported
+ * for unit tests.
  */
 var computeSegmentTop = function (lineTop, lineFontSize, segFontSize, baselineOffset) {
-    if (baselineOffset === "superscript")
-        return lineTop;
-    if (baselineOffset === "subscript") {
-        return lineTop + (lineFontSize - segFontSize);
-    }
-    return lineTop + (lineFontSize - segFontSize) * ALPHABETIC_BASELINE_RATIO;
+    return lineTop +
+        (lineFontSize - segFontSize) * ALPHABETIC_BASELINE_RATIO +
+        (0, alignment_1.getScriptBaselineShift)(baselineOffset, lineFontSize);
 };
 exports.computeSegmentTop = computeSegmentTop;
 /**
@@ -256,7 +253,7 @@ var atomsToSegments = function (atoms) {
  *  - Mention runs render as their inline label only (no chrome).
  */
 exports.CellTextRuns = react_1.default.memo(function (props) {
-    var x = props.x, y = props.y, width = props.width, height = props.height, padding = props.padding, value = props.value, runs = props.runs, baseColor = props.baseColor, baseFontFamily = props.baseFontFamily, baseFontSize = props.baseFontSize, baseBold = props.baseBold, baseItalic = props.baseItalic, baseUnderline = props.baseUnderline, baseStrikethrough = props.baseStrikethrough, baseBaselineOffset = props.baseBaselineOffset, horizontalAlign = props.horizontalAlign, verticalAlign = props.verticalAlign, lineHeight = props.lineHeight, lineHeightMode = props.lineHeightMode, scale = props.scale, wrap = props.wrap, theme = props.theme;
+    var x = props.x, y = props.y, width = props.width, height = props.height, padding = props.padding, value = props.value, runs = props.runs, baseColor = props.baseColor, baseFontFamily = props.baseFontFamily, baseFontSize = props.baseFontSize, baseBold = props.baseBold, baseItalic = props.baseItalic, baseUnderline = props.baseUnderline, baseStrikethrough = props.baseStrikethrough, baseBaselineOffset = props.baseBaselineOffset, horizontalAlign = props.horizontalAlign, verticalAlign = props.verticalAlign, lineHeight = props.lineHeight, lineHeightMode = props.lineHeightMode, scale = props.scale, wrap = props.wrap, theme = props.theme, _a = props.fontScale, fontScale = _a === void 0 ? 1 : _a, rotation = props.rotation;
     var sceneFunc = (0, react_1.useCallback)(function (context, _shape) {
         var e_3, _a, e_4, _b, e_5, _c, e_6, _d, e_7, _e;
         var baseResolved = {
@@ -281,7 +278,7 @@ exports.CellTextRuns = react_1.default.memo(function (props) {
         // it walks; the per-segment paint loop below sets it again per
         // segment so the mutation here is safe.
         var measureAtom = function (atom) {
-            var r = (0, exports.resolveSegmentStyle)({ text: atom.text, format: atom.format }, baseResolved, theme);
+            var r = (0, exports.resolveSegmentStyle)({ text: atom.text, format: atom.format }, baseResolved, theme, fontScale);
             context.setAttr("font", buildFontString(r));
             return context.measureText(atom.text).width;
         };
@@ -365,7 +362,7 @@ exports.CellTextRuns = react_1.default.memo(function (props) {
         var resolvedLines = lines.map(function (lineSegments) {
             return lineSegments.map(function (seg) { return ({
                 seg: seg,
-                r: (0, exports.resolveSegmentStyle)(seg, baseResolved, theme),
+                r: (0, exports.resolveSegmentStyle)(seg, baseResolved, theme, fontScale),
             }); });
         });
         var _h = (0, exports.computeLineMetrics)(resolvedLines, baseResolved, function (r) {
@@ -476,7 +473,8 @@ exports.CellTextRuns = react_1.default.memo(function (props) {
         height,
         padding,
         theme,
+        fontScale,
     ]);
-    return (react_1.default.createElement(react_konva_1.Shape, { x: x, y: y, width: width, height: height, sceneFunc: sceneFunc, listening: false, perfectDrawEnabled: false }));
+    return (react_1.default.createElement(react_konva_1.Shape, { x: x, y: y, width: width, height: height, rotation: rotation, sceneFunc: sceneFunc, listening: false, perfectDrawEnabled: false }));
 });
 exports.CellTextRuns.displayName = "CellTextRuns";

package/dist/cjs/components/cell/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../components/cell/index.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA4B,MAAM,OAAO,CAAC;AA4CjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAU3C,eAAO,MAAM,IAAI,oCAAgB,SAAS,uBA0oBxC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../components/cell/index.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAuDjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAO3C,eAAO,MAAM,IAAI,oCAAgB,SAAS,uBAoiCxC,CAAC"}