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.

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

Set isSelected to false for formatHolder of list item #2540

Merged
merged 7 commits into from
Mar 28, 2024
Merged

Set isSelected to false for formatHolder of list item #2540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1376b9e
Fix 262677: Allow insert entity to a specified position without chang…
JiuqingSong Mar 27, 2024
8286c5b
Merge branch 'master' into u/jisong/262677_2
JiuqingSong Mar 27, 2024
a5db53d
Set isSelected to false for formatHolder of list item
JiuqingSong Mar 28, 2024
ab1af1d
Merge branch 'master' into u/jisong/formatHolder
JiuqingSong Mar 28, 2024
ee84079
Merge branch 'master' into u/jisong/formatHolder
JiuqingSong Mar 28, 2024
cda4540
Merge branch 'master' into u/jisong/formatHolder
JiuqingSong Mar 28, 2024
7d2c4ba
Merge branch 'master' into u/jisong/formatHolder
JiuqingSong Mar 28, 2024
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
42 changes: 21 additions & 21 deletions demo/scripts/controlsV2/sidePane/presets/allPresets/listPresets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const simpleList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -78,7 +78,7 @@ export const simpleList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -130,7 +130,7 @@ export const simpleList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -191,7 +191,7 @@ export const simpleList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -266,7 +266,7 @@ export const simpleList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -307,7 +307,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -346,7 +346,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -385,7 +385,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -424,7 +424,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -472,7 +472,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -520,7 +520,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -568,7 +568,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -625,7 +625,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -682,7 +682,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -739,7 +739,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -769,7 +769,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -808,7 +808,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -856,7 +856,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -904,7 +904,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -943,7 +943,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -973,7 +973,7 @@ export const numberedList: Preset = {
],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down
16 changes: 8 additions & 8 deletions packages/roosterjs-content-model-api/test/modelApi/block/setModelAlignmentTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ describe('align left', () => {
blocks: [para1, para2, para3],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {
Expand Down Expand Up @@ -254,7 +254,7 @@ describe('align left', () => {
blocks: [para1, para2, para3],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {
Expand Down Expand Up @@ -369,7 +369,7 @@ describe('align left', () => {
blocks: [para1, para2, para3],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: { textAlign: 'center' },
Expand Down Expand Up @@ -482,7 +482,7 @@ describe('align left', () => {
blocks: [para1, para2, para3],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: { textAlign: 'end' },
Expand Down Expand Up @@ -597,7 +597,7 @@ describe('align left', () => {
blocks: [para1, para2, para3],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {
Expand Down Expand Up @@ -717,7 +717,7 @@ describe('align left', () => {
blocks: [para1, para2, para3],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {
Expand Down Expand Up @@ -838,7 +838,7 @@ describe('align left', () => {
blocks: [para1, para2, para3],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {
Expand Down Expand Up @@ -964,7 +964,7 @@ describe('align left', () => {
blocks: [para, para2],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: { textAlign: 'justify' },
Expand Down
8 changes: 4 additions & 4 deletions packages/roosterjs-content-model-api/test/modelApi/block/setModelDirectionTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ describe('setModelDirection', () => {
formatHolder: {
segmentType: 'SelectionMarker',
format: {},
isSelected: true,
isSelected: false,
},
levels: [
{
Expand Down Expand Up @@ -142,7 +142,7 @@ describe('setModelDirection', () => {
formatHolder: {
segmentType: 'SelectionMarker',
format: {},
isSelected: true,
isSelected: false,
},
levels: [
{
Expand Down Expand Up @@ -178,7 +178,7 @@ describe('setModelDirection', () => {
formatHolder: {
segmentType: 'SelectionMarker',
format: {},
isSelected: true,
isSelected: false,
},
levels: [
{
Expand Down Expand Up @@ -209,7 +209,7 @@ describe('setModelDirection', () => {
formatHolder: {
segmentType: 'SelectionMarker',
format: {},
isSelected: true,
isSelected: false,
},
levels: [
{
Expand Down
18 changes: 9 additions & 9 deletions packages/roosterjs-content-model-api/test/modelApi/block/setModelIndentationTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ describe('indent', () => {
},
],
blocks: [para1, para2, para3],
formatHolder: { segmentType: 'SelectionMarker', isSelected: true, format: {} },
formatHolder: { segmentType: 'SelectionMarker', isSelected: false, format: {} },
format: {},
},
],
Expand Down Expand Up @@ -355,7 +355,7 @@ describe('indent', () => {
},
],
blocks: [para1, para2, para3],
formatHolder: { segmentType: 'SelectionMarker', isSelected: true, format: {} },
formatHolder: { segmentType: 'SelectionMarker', isSelected: false, format: {} },
format: {},
},
],
Expand Down Expand Up @@ -397,7 +397,7 @@ describe('indent', () => {
},
],
blocks: [para2],
formatHolder: { segmentType: 'SelectionMarker', isSelected: true, format: {} },
formatHolder: { segmentType: 'SelectionMarker', isSelected: false, format: {} },
format: {},
},
listItem3,
Expand Down Expand Up @@ -450,7 +450,7 @@ describe('indent', () => {
},
],
blocks: [para1, para2],
formatHolder: { segmentType: 'SelectionMarker', isSelected: true, format: {} },
formatHolder: { segmentType: 'SelectionMarker', isSelected: false, format: {} },
format: {},
},
{
Expand All @@ -465,7 +465,7 @@ describe('indent', () => {
},
],
blocks: [para3],
formatHolder: { segmentType: 'SelectionMarker', isSelected: true, format: {} },
formatHolder: { segmentType: 'SelectionMarker', isSelected: false, format: {} },
format: {},
},
],
Expand Down Expand Up @@ -517,7 +517,7 @@ describe('indent', () => {
},
],
blocks: [para1, para2],
formatHolder: { segmentType: 'SelectionMarker', isSelected: true, format: {} },
formatHolder: { segmentType: 'SelectionMarker', isSelected: false, format: {} },
format: {},
},
{
Expand All @@ -533,7 +533,7 @@ describe('indent', () => {
},
],
blocks: [para3],
formatHolder: { segmentType: 'SelectionMarker', isSelected: true, format: {} },
formatHolder: { segmentType: 'SelectionMarker', isSelected: false, format: {} },
format: {},
},
],
Expand Down Expand Up @@ -586,7 +586,7 @@ describe('indent', () => {
},
],
blocks: [para1],
formatHolder: { segmentType: 'SelectionMarker', isSelected: true, format: {} },
formatHolder: { segmentType: 'SelectionMarker', isSelected: false, format: {} },
format: {},
},
{
Expand All @@ -602,7 +602,7 @@ describe('indent', () => {
},
],
blocks: [para2],
formatHolder: { segmentType: 'SelectionMarker', isSelected: true, format: {} },
formatHolder: { segmentType: 'SelectionMarker', isSelected: false, format: {} },
format: {},
},
{
Expand Down
4 changes: 2 additions & 2 deletions packages/roosterjs-content-model-api/test/modelApi/block/toggleModelBlockQuoteTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ describe('toggleModelBlockQuote', () => {
levels: [],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down Expand Up @@ -693,7 +693,7 @@ describe('toggleModelBlockQuote', () => {
levels: [],
formatHolder: {
segmentType: 'SelectionMarker',
isSelected: true,
isSelected: false,
format: {},
},
format: {},
Expand Down
Loading
Loading