Skip to content

Commit 795fad2

Browse files
JiuqingSongBryanValverdeUjuliaroldiCopilotflorian-msft
authored
Bump dom package to 9.29.1 to include #3055 (#3057)
* Use FormatContainer to represent DIV with id (#3003) * Fix #3005 (#3007) * Fix a cache issue (#3006) * Refactor getStyleMetadata to not rely on DomCreator and only use String handling (#3010) * Refactor paste plugin to remove unused DOMCreator parameter and enhance style extraction logic * fix test * Change search string to lowercase * Clean image edit when undo (#3015) * undo image * undo image * undo image * Add 'CustomCopyCut' experimental feature to fix some copy cut bugs (#3000) * Add 'CustomCopyCut' experimental feature to enhance copy/cut behavior * Implement pruneUnselectedModel utility for optimizing copy/paste behavior * Try fix iuld * Address comment and fix broken tests * Revert unneeded change * Refactor pruneUnselectedModel --------- Co-authored-by: Jiuqing Song <jisong@microsoft.com> * Demo site: Add preset content for undeleteable anchor (#3014) Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> * Revert "Refactor getStyleMetadata to not rely on DomCreator and only use Stri…" (#3020) This reverts commit 5bbab35. * Add API playground for createModelFromHTML (#3019) * Add API playground for createModelFromHTML * imporve --------- Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> * Do not copy div ID on Enter (#3011) * wip * insertCustom * refactor * formatKeys * Add image hidden marker (#3021) Instead of using a dataset to store the isEditing property, a hidden property is now used. To support this, get/set functions and the ImageMarkerFormat were introduced. The imageMarker property can now be accessed through the format property of the image. This change eliminates the need to manually remove the dataset from the image element when extracting content from the DOM. * Include ImageMetadata in FormatState (#3023) * Support List Pasting from PowerPoint Desktop (#3012) * Refactor paste parsers: add removeNegativeTextIndentParser and deprecatedBorderColorParser; update imports and constants for bullet list types * Update packages/roosterjs-content-model-plugins/lib/paste/PowerPoint/processPastedContentFromPowerPoint.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Refactor bullet list constants and improve format parser signatures --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Remove comments `<!--` and `-->` from styles and re apply fix for Word Desktop Pasting (#3024) * Update dependencies and enhance paste functionality by cleaning HTML comments in style tags * Reapply "Refactor getStyleMetadata to not rely on DomCreator and only use Stri…" (#3020) This reverts commit 32f47bf. * Enhance cleanHtmlComments to handle both HTML comment formats in style tags * Set original DOMPurify * Update packages/roosterjs-content-model-plugins/lib/paste/WordDesktop/getStyleMetadata.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Ensure headEndIndex is valid * address comment * Address comments --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Jiuqing Song <jisong@microsoft.com> * insert link in the image (#3027) When the image is selected, do not replace the image with the link, add the link to image segment. * square (#3029) Instead of using a square character, this change updates the square style to use the 'square' style. * Normalize default format (#3028) * Normalize default format * improve --------- Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> * auto link (#3026) * Add margin-inline-start to watermark styles for improved positioning (#3031) * Allow queryContentModelBlocks to query blocks in entities (#3032) * Allow queryContentModelBlocks to search children of entity * Expect EditorContext instead * Break out createEditorContextForEntity function into separate file and add tests * Fix 353323: Keep indentation when start a list, and refactor (#3033) * 353323 * fix build, add test * improve * Edit plugin Options (#3036) * options * add test * Do not indent on TAB (#3039) * keyboard tab * remove import * Fix 354663 (#3038) * Fix 354663 * export the new function * Fix Word Desktop paste case (#3034) Co-authored-by: Jiuqing Song <jisong@microsoft.com> * Add height property to table rows in paste tests and processor (#3045) * Add height property to table rows in paste tests and processor * Fix build * Remove local change * Fix A11y bug with table selection (#3041) * Fix A11y bug with table selection * Add comment * Fix 341291 (#3046) * Fix Word Desktop pasting when using Safari (#3047) * Enhance paste functionality: support additional document types and extract HTML head content * Fix paste source validations for Safari: update environment handling and improve document detection logic * Add environment param back * Prevent multiple event attachments for mousemove in SelectionPlugin (#3049) * Prevent multiple event attachments for mousemove in SelectionPlugin * Update packages/roosterjs-content-model-core/test/corePlugin/selection/SelectionPluginTest.ts * Refactor mouse event handling in SelectionPlugin to ensure proper cleanup and re-attachment on mouseDown events * Only paste text content of button (#3050) * Enhance paste functionality: Update setProcessor call counts in tests and add pasteButtonProcessor unit tests * Refactor pasteButtonProcessor: Enhance button element processing and add comprehensive unit tests * Support table edit with logical root (#3048) * Support table edit with logical root * fix build and test --------- Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> * If font family already has single quote, keep it (#3055) * 9.29.1 --------- Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> Co-authored-by: Julia Roldi <87443959+juliaroldi@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: florian-msft <87671048+florian-msft@users.noreply.github.com>
1 parent 7cead40 commit 795fad2

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

packages/roosterjs-content-model-dom/lib/domUtils/style/normalizeFontFamily.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @returns The normalized font family string
66
*/
77
export function normalizeFontFamily(fontFamily: string): string {
8-
const existingQuotedFontsRegex = /".*?"/g;
8+
const existingQuotedFontsRegex = /(".*?")|('.*?')/g;
99
let match = existingQuotedFontsRegex.exec(fontFamily);
1010
let start = 0;
1111
const result: string[] = [];

packages/roosterjs-content-model-dom/test/domUtils/style/normalizeFontFamilyTest.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,16 @@ describe('normalizeFontFamily', () => {
125125
it('font family with dots', () => {
126126
expect(normalizeFontFamily('A.B')).toBe('"A.B"');
127127
});
128+
129+
it('font family has single quote', () => {
130+
expect(normalizeFontFamily("'Corbel','Skia',sans-serif")).toBe(
131+
"'Corbel', 'Skia', sans-serif"
132+
);
133+
});
134+
135+
it('mixed single quoted and double quoted font families', () => {
136+
expect(normalizeFontFamily('"Corbel",\'Skia\',sans-serif')).toBe(
137+
'"Corbel", \'Skia\', sans-serif'
138+
);
139+
});
128140
});

versions.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"react": "9.0.2",
33
"main": "9.29.0",
4-
"legacyAdapter": "8.63.2"
4+
"legacyAdapter": "8.63.2",
5+
"overrides": {
6+
"roosterjs-content-model-dom": "9.29.1"
7+
}
58
}

0 commit comments

Comments
 (0)