Skip to content

Commit

Permalink
Merge pull request #2794 from microsoft/u/juliaroldi/pasted-images
Browse files Browse the repository at this point in the history 
Fix findEditingImage
  • Loading branch information
@juliaroldi
juliaroldi authored Sep 12, 2024
2 parents 0640f45 + c9edd47 commit 1c20684
Show file tree
Hide file tree
Showing 2 changed files with 279 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/roosterjs-content-model-plugins/lib/imageEdit/utils/findEditingImage.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export function findEditingImage(
switch (segment.segmentType) {
case 'Image':
if (
(segment.dataset.isEditing && !imageId) ||
segment.format.id == imageId
(imageId && segment.format.id == imageId) ||
segment.dataset.isEditing
) {
return {
paragraph: block,
Expand Down
277 changes: 277 additions & 0 deletions packages/roosterjs-content-model-plugins/test/imageEdit/utils/findEditingImageTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,4 +449,281 @@ describe('findEditingImage', () => {
},
});
});

it('editing image - no id - no editing image | by Id', () => {
const model: ContentModelDocument = {
blockGroupType: 'Document',
blocks: [
{
blockType: 'Paragraph',
segments: [
{
segmentType: 'Image',
src: 'test',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
maxWidth: '1800px',
},
dataset: {},
},
],
format: {},
segmentFormat: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
],
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: '#000000',
},
};

const image = findEditingImage(model);
expect(image).toEqual(null);
});

it('editing image - no id - editing image', () => {
const model: ContentModelDocument = {
blockGroupType: 'Document',
blocks: [
{
blockType: 'Paragraph',
segments: [
{
segmentType: 'Image',
src: 'test',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
maxWidth: '1800px',
},
dataset: {},
},
],
format: {},
segmentFormat: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
{
blockType: 'Paragraph',
segments: [
{
segmentType: 'Text',
text: 'second line',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
],
format: {},
segmentFormat: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
{
blockType: 'Paragraph',
segments: [
{
segmentType: 'Image',
src: 'second-Image',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
maxWidth: '1800px',
},
dataset: {
isEditing: 'true',
},
},
],
format: {},
segmentFormat: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
],
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: '#000000',
},
};

const image = findEditingImage(model);
expect(image).toEqual({
image: {
segmentType: 'Image',
src: 'second-Image',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
maxWidth: '1800px',
},
dataset: {
isEditing: 'true',
},
},
paragraph: {
blockType: 'Paragraph',
segments: [
{
segmentType: 'Image',
src: 'second-Image',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
maxWidth: '1800px',
},
dataset: {
isEditing: 'true',
},
},
],
format: {},
segmentFormat: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
});
});

it('editing image - with id - editing image', () => {
const model: ContentModelDocument = {
blockGroupType: 'Document',
blocks: [
{
blockType: 'Paragraph',
segments: [
{
segmentType: 'Image',
src: 'test',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
maxWidth: '1800px',
id: 'testId',
},
dataset: {},
},
],
format: {},
segmentFormat: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
{
blockType: 'Paragraph',
segments: [
{
segmentType: 'Text',
text: 'second line',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
],
format: {},
segmentFormat: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
{
blockType: 'Paragraph',
segments: [
{
segmentType: 'Image',
src: 'second-Image',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
maxWidth: '1800px',
},
dataset: {
isEditing: 'true',
},
},
],
format: {},
segmentFormat: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
],
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: '#000000',
},
};

const image = findEditingImage(model, 'testId');
expect(image).toEqual({
image: {
segmentType: 'Image',
src: 'test',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
maxWidth: '1800px',
id: 'testId',
},
dataset: {},
},
paragraph: {
blockType: 'Paragraph',
segments: [
{
segmentType: 'Image',
src: 'test',
format: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
maxWidth: '1800px',
id: 'testId',
},
dataset: {},
},
],
format: {},
segmentFormat: {
fontFamily: 'Calibri',
fontSize: '11pt',
textColor: 'rgb(0, 0, 0)',
},
},
});
});
});

0 comments on commit 1c20684

Please sign in to comment.