Skip to content
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.

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

Customize the behavior of merging format values #2865

Merged

Conversation

Rain-Zheng
Copy link
Contributor

@Rain-Zheng Rain-Zheng commented Nov 8, 2024

We are working on a feature that displays a prompt in the formatting bar when the selected content contains multiple formatting values. For example, if the selected content includes text elements with both "Aptos" and "Arial" fonts, a "Multiple fonts" prompt will be shown to the user. So we are adding a parameter to getFormatState to allow customization of the merge behavior.

@JiuqingSong
Copy link
Collaborator

Instead of providing a callback, I prefer to add a parameter to indicate how to solve conflict format, and default value is to "remove" (current behavior)

For example:

type ConflictFormatSolution = 'remove' | 'keepFirst' | 'returnMultiple';

export function getFormatState(editor: IEditor, conflictSolution: ConflictFormatSolution = 'remove') {
 ...
}

@JiuqingSong JiuqingSong merged commit b1bf4e3 into microsoft:master Nov 14, 2024
4 checks passed
BryanValverdeU added a commit that referenced this pull request Nov 15, 2024
* fix test

* test

* Merge text node and segments (#2846)

* Merge text segments

* Fix test

* merge node

* fix build and test

* add test

* Add test

* fix test

* Remove tablePreProcessor (#2849)

* Add change data and apiName to ContentChangedEvent when handle keyboard input (#2854)

* Fix #2857 (#2858)

* Revert Shortcut command for Clear Format on mac (#2834)

* revert Shortcut command for Clear Format on mac

* fix ctrl and meta can press in the same time

* update comment

* Allow browser's default paste behavior when pasting from Office Android (#2863)

* Implement shouldPreventDefaultPaste function

* fix build

* fix build

* list-bugs

* fix image floating

* Customize the behavior of merging format values (#2865)

* define types

* add callbacks

* use param instead

* fix test

---------

Co-authored-by: Jiuqing Song <jisong@microsoft.com>

* updateVersion.json

* Fix merge segment issue (#2871)

---------

Co-authored-by: Julia Roldi (from Dev Box) <juliaroldi@microsoft.com>
Co-authored-by: Julia Roldi <87443959+juliaroldi@users.noreply.github.com>
Co-authored-by: Jiuqing Song <jisong@microsoft.com>
Co-authored-by: 庄黛淳华 <miku1958@users.noreply.github.com>
Co-authored-by: Rain-Zheng <67583056+Rain-Zheng@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants