Skip to content

Commit

Permalink
fix: fix issue with richtext edit multiline
Browse files Browse the repository at this point in the history
  • Loading branch information
@neuqzxy
neuqzxy committed Dec 23, 2024
1 parent 0e4846f commit 131ca9f
Show file tree
Hide file tree
Showing 4 changed files with 462 additions and 120 deletions.
279 changes: 279 additions & 0 deletions packages/vrender-core/__tests__/richtext_editor/richtext_editor.test.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,279 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
// @ts-nocheck
import { findCursorIdxByConfigIndex, findConfigIndexByCursorIdx } from '../../src/plugins/builtin-plugin/edit-module';

const textConfig1 = [
{
text: '我',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
fill: '#0f51b5'
},
{
text: '们',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
fill: '#0f51b5'
},
{
text: '是',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
fill: '#0f51b5'
}
];
const textConfig2 = [
{
text: '我',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
fill: '#0f51b5'
},
{
fill: '#0f51b5',
text: '\n',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
isComposing: false
},
{
fill: '#0f51b5',
text: '\n',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
isComposing: false
},
{
fill: '#0f51b5',
text: '\n',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
isComposing: false
},
{
fill: '#0f51b5',
text: '\n',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
isComposing: false
},
{
text: '们',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
fill: '#0f51b5'
},
{
text: '是',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
fill: '#0f51b5'
}
];
const textConfig3 = [
{
text: '我',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
fill: '#0f51b5'
},
{
fill: '#0f51b5',
text: '\n',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
isComposing: false
},
{
fill: '#0f51b5',
text: '\n',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
isComposing: false
},
{
fill: '#0f51b5',
text: 'a',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
isComposing: false
},
{
fill: '#0f51b5',
text: '\n',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
isComposing: false
},
{
fill: '#0f51b5',
text: '\n',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
isComposing: false
},
{
text: '们',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
fill: '#0f51b5'
},
{
text: '是',
fontSize: 16,
lineHeight: 26,
textAlign: 'center',
background: 'orange',
fill: '#0f51b5'
}
];

describe('richtext_editor', () => {
it('richtext_editor findConfigIndexByCursorIdx config 1', () => {
// expect(findConfigIndexByCursorIdx(textConfig1, -0.1)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig1, 0.1)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig1, 0.9)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig1, 1.1)).toEqual(1);
// expect(findConfigIndexByCursorIdx(textConfig1, 1.9)).toEqual(1);
// expect(findConfigIndexByCursorIdx(textConfig1, 2.1)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig1, -0.1, 1)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig1, 0.1, 1)).toEqual(1);
// expect(findConfigIndexByCursorIdx(textConfig1, 0.9, 1)).toEqual(1);
// expect(findConfigIndexByCursorIdx(textConfig1, 1.1, 1)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig1, 1.9, 1)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig1, 2.1, 1)).toEqual(2);
});

it('richtext_editor findConfigIndexByCursorIdx config 2', () => {
// expect(findConfigIndexByCursorIdx(textConfig2, -0.1)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig2, 0.1)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig2, 0.9)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig2, 1.1)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig2, 1.9)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig2, 2.1)).toEqual(3);
// expect(findConfigIndexByCursorIdx(textConfig2, 2.9)).toEqual(3);
// expect(findConfigIndexByCursorIdx(textConfig2, 3.1)).toEqual(4);
// expect(findConfigIndexByCursorIdx(textConfig2, 3.9)).toEqual(4);
// expect(findConfigIndexByCursorIdx(textConfig2, 4.1)).toEqual(5);
// expect(findConfigIndexByCursorIdx(textConfig2, 4.9)).toEqual(5);
// expect(findConfigIndexByCursorIdx(textConfig2, 5.1)).toEqual(6);
// expect(findConfigIndexByCursorIdx(textConfig2, -0.1, 1)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig2, 0.1, 1)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig2, 0.9, 1)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig2, 1.1, 1)).toEqual(3);
// expect(findConfigIndexByCursorIdx(textConfig2, 1.9, 1)).toEqual(3);
// expect(findConfigIndexByCursorIdx(textConfig2, 2.1, 1)).toEqual(4);
// expect(findConfigIndexByCursorIdx(textConfig2, 2.9, 1)).toEqual(4);
// expect(findConfigIndexByCursorIdx(textConfig2, 3.1, 1)).toEqual(5);
// expect(findConfigIndexByCursorIdx(textConfig2, 3.9, 1)).toEqual(5);
// expect(findConfigIndexByCursorIdx(textConfig2, 4.1, 1)).toEqual(6);
// expect(findConfigIndexByCursorIdx(textConfig2, 4.9, 1)).toEqual(6);
// expect(findConfigIndexByCursorIdx(textConfig2, 5.1, 1)).toEqual(6);
});

it('richtext_editor findConfigIndexByCursorIdx config 3', () => {
// expect(findConfigIndexByCursorIdx(textConfig3, -0.1)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig3, 0.1)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig3, 0.9)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig3, 1.1)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig3, 1.9)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig3, 2.1)).toEqual(3);
// expect(findConfigIndexByCursorIdx(textConfig3, 2.9)).toEqual(3);
// expect(findConfigIndexByCursorIdx(textConfig3, 3.1)).toEqual(5);
// expect(findConfigIndexByCursorIdx(textConfig3, 3.9)).toEqual(5);
// expect(findConfigIndexByCursorIdx(textConfig3, 4.1)).toEqual(6);
// expect(findConfigIndexByCursorIdx(textConfig3, 4.9)).toEqual(6);
// expect(findConfigIndexByCursorIdx(textConfig3, 5.1)).toEqual(7);
// expect(findConfigIndexByCursorIdx(textConfig3, 5.9)).toEqual(7);
// expect(findConfigIndexByCursorIdx(textConfig3, -0.1, 1)).toEqual(0);
// expect(findConfigIndexByCursorIdx(textConfig3, 0.1, 1)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig3, 0.9, 1)).toEqual(2);
// expect(findConfigIndexByCursorIdx(textConfig3, 1.1, 1)).toEqual(3);
// expect(findConfigIndexByCursorIdx(textConfig3, 1.9, 1)).toEqual(3);
// expect(findConfigIndexByCursorIdx(textConfig3, 2.1, 1)).toEqual(5);
// expect(findConfigIndexByCursorIdx(textConfig3, 2.9, 1)).toEqual(5);
// expect(findConfigIndexByCursorIdx(textConfig3, 3.1, 1)).toEqual(6);
// expect(findConfigIndexByCursorIdx(textConfig3, 3.9, 1)).toEqual(6);
// expect(findConfigIndexByCursorIdx(textConfig3, 4.1, 1)).toEqual(7);
// expect(findConfigIndexByCursorIdx(textConfig3, 4.9, 1)).toEqual(7);
// expect(findConfigIndexByCursorIdx(textConfig3, 5.1, 1)).toEqual(7);
// expect(findConfigIndexByCursorIdx(textConfig3, 5.9, 1)).toEqual(7);
});

it('richtext_editor findCursorIdxByConfigIndex config 1', () => {
// expect(findCursorIdxByConfigIndex(textConfig1, 0)).toEqual(0.1);
// expect(findCursorIdxByConfigIndex(textConfig1, 1)).toEqual(1.1);
// expect(findCursorIdxByConfigIndex(textConfig1, 2)).toEqual(2.1);
// expect(findCursorIdxByConfigIndex(textConfig1, 0, -0.1)).toEqual(-0.1);
// expect(findCursorIdxByConfigIndex(textConfig1, 1, -0.1)).toEqual(0.9);
// expect(findCursorIdxByConfigIndex(textConfig1, 2, -0.1)).toEqual(1.9);
});
it('richtext_editor findCursorIdxByConfigIndex config 2', () => {
// expect(findCursorIdxByConfigIndex(textConfig2, 0)).toEqual(0.1);
// expect(findCursorIdxByConfigIndex(textConfig2, 1)).toEqual(0.9);
// expect(findCursorIdxByConfigIndex(textConfig2, 2)).toEqual(0.9);
// expect(findCursorIdxByConfigIndex(textConfig2, 3)).toEqual(1.9);
// expect(findCursorIdxByConfigIndex(textConfig2, 4)).toEqual(2.9);
// expect(findCursorIdxByConfigIndex(textConfig2, 5)).toEqual(4.1);
// expect(findCursorIdxByConfigIndex(textConfig2, 6)).toEqual(5.1);
// expect(findCursorIdxByConfigIndex(textConfig2, 0, -0.1)).toEqual(-0.1);
// expect(findCursorIdxByConfigIndex(textConfig2, 1, -0.1)).toEqual(0.9);
// expect(findCursorIdxByConfigIndex(textConfig2, 2, -0.1)).toEqual(0.9);
// expect(findCursorIdxByConfigIndex(textConfig2, 3, -0.1)).toEqual(1.9);
// expect(findCursorIdxByConfigIndex(textConfig2, 4, -0.1)).toEqual(2.9);
// expect(findCursorIdxByConfigIndex(textConfig2, 5, -0.1)).toEqual(3.9);
// expect(findCursorIdxByConfigIndex(textConfig2, 6, -0.1)).toEqual(4.9);
});
it('richtext_editor findCursorIdxByConfigIndex config 3', () => {
// expect(findCursorIdxByConfigIndex(textConfig3, 0)).toEqual(0.1);
// expect(findCursorIdxByConfigIndex(textConfig3, 1)).toEqual(0.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 2)).toEqual(0.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 3)).toEqual(2.1);
// expect(findCursorIdxByConfigIndex(textConfig3, 4)).toEqual(2.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 5)).toEqual(2.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 6)).toEqual(4.1);
// expect(findCursorIdxByConfigIndex(textConfig3, 7)).toEqual(5.1);
// expect(findCursorIdxByConfigIndex(textConfig3, 0, -0.1)).toEqual(-0.1);
// expect(findCursorIdxByConfigIndex(textConfig3, 1, -0.1)).toEqual(0.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 2, -0.1)).toEqual(0.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 3, -0.1)).toEqual(1.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 4, -0.1)).toEqual(2.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 5, -0.1)).toEqual(2.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 6, -0.1)).toEqual(3.9);
// expect(findCursorIdxByConfigIndex(textConfig3, 7, -0.1)).toEqual(4.9);
});
});
1 change: 1 addition & 0 deletions packages/vrender-core/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ export * from './plugins/builtin-plugin/html-attribute-plugin';
export * from './plugins/builtin-plugin/react-attribute-plugin';
export * from './plugins/builtin-plugin/3dview-transform-plugin';
export * from './plugins/builtin-plugin/flex-layout-plugin';
export * from './plugins/builtin-plugin/edit-module';
Loading

0 comments on commit 131ca9f

Please sign in to comment.