Skip to content

chore: add constants in node view, lint and format #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harbournick merged 1 commit into from
Aug 13, 2025
Merged

chore: add constants in node view, lint and format #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/super-editor/src/core/super-converter/v2/importer/runNodeImporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const handleRunNode = (params) => {
const defaultNodeStyles = getMarksFromStyles(docx, parentStyleId);

if (hasRunProperties) {
const { marks = [], attributes = {} } = parseProperties(node);
const { marks = [] } = parseProperties(node);

/* Store run style attributes in an array, then store the defaultNodeStyles (parent styles) in a second array
Then combine the two arrays and create a new array of marks, where the
Expand Down
21 changes: 17 additions & 4 deletions packages/super-editor/src/extensions/list-item/ListItemNodeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import { docxNumberigHelpers } from '@/core/super-converter/v2/importer/listImpo
const MARKER_PADDING = 6;
const MARKER_OFFSET_RIGHT = 4;
const MIN_MARKER_WIDTH = 20;
const POINT_TO_PIXEL_CONVERSION_FACTOR = 1.33;
const DEFAULT_FONT_FAMILY = 'Arial, sans-serif';
const DEFAULT_FONT_SIZE = '10pt';

const IS_DEBUGGING = false;

Expand Down Expand Up @@ -338,26 +341,36 @@ export const getVisibleIndent = (stylePpr, numDefPpr, inlineIndent) => {
return result;
};

/**
* Calculate the width of the list item marker.
* @param {HTMLElement} dom - The DOM element of the list item.
* @param {HTMLElement} numberingDOM - The DOM element of the numbering.
* @param {Object} param2 - Additional parameters.
* @param {boolean} param2.withPadding - Whether to include padding in the calculation.
* @returns {number} The width of the marker.
*/
function calculateMarkerWidth(dom, numberingDOM, { withPadding = true } = {}) {
const markerText = numberingDOM.textContent || '';
const fontSize = dom.style.fontSize || '10pt';
const fontSize = dom.style.fontSize || DEFAULT_FONT_SIZE;
const fontValue = dom.style.fontFamily;
const fontFamily = fontValue && fontValue !== 'inherit' ? fontValue : 'Arial';
const fontFamily = fontValue && fontValue !== 'inherit' ? fontValue : DEFAULT_FONT_FAMILY;
Comment thread
harbournick marked this conversation as resolved.

if (!markerText.trim()) return 0;

try {
const canvas = document.createElement('canvas');
const context = canvas.getContext('2d');

const fontSizePx = fontSize.includes('pt') ? Number.parseFloat(fontSize) * 1.33 : Number.parseFloat(fontSize);
const fontSizePx = fontSize.includes('pt')
? Number.parseFloat(fontSize) * POINT_TO_PIXEL_CONVERSION_FACTOR
: Number.parseFloat(fontSize);

context.font = `${fontSizePx}px ${fontFamily}`;

const textWidth = context.measureText(markerText).width;
const resultWidth = withPadding ? Math.ceil(textWidth + MARKER_PADDING) : Math.ceil(textWidth);
return resultWidth;
} catch (err) {
} catch {
return 0;
}
}
Loading