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

Editor autocomplete - does not open in a second use #5290

Merged
merged 7 commits into from
Mar 12, 2024
Merged

Editor autocomplete - does not open in a second use #5290

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
17f7772
fix: wrong slice of content
ainouzgali Mar 10, 2024
3973a52
Merge branch 'next' into nv-3403-editor-autocomplete-does-not-open-in…
ainouzgali Mar 11, 2024
8cff6ca
Merge branch 'next' into nv-3403-editor-autocomplete-does-not-open-in…
ainouzgali Mar 11, 2024
f7b70af
fix: get last index
ainouzgali Mar 11, 2024
032a1bc
Merge branch 'next' into nv-3403-editor-autocomplete-does-not-open-in…
ainouzgali Mar 12, 2024
47010aa
Merge branch 'next' into nv-3403-editor-autocomplete-does-not-open-in…
ainouzgali Mar 12, 2024
f9ee22d
Merge branch 'next' into nv-3403-editor-autocomplete-does-not-open-in…
ainouzgali Mar 12, 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
6 changes: 3 additions & 3 deletions apps/web/src/pages/templates/components/email-editor/TextRowContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ export function TextRowContent({ blockIndex }: { blockIndex: number }) {

const checkPreviousChar = (data: string, anchorPos: number) => {
if (anchorPos > 1) {
const endContent = data.slice(anchorPos);
const endContent = data.slice(anchorPos - 2);

const contentToUse = endContent ? endContent : data;
const slicePositions = contentToUse.indexOf('{{') + 2;
const slicePositions = contentToUse.lastIndexOf('{') + 1;

const currentChar = contentToUse.charAt(slicePositions - 1);
const previousChar = contentToUse.charAt(slicePositions - 2);
Expand Down Expand Up @@ -114,7 +114,7 @@ export function TextRowContent({ blockIndex }: { blockIndex: number }) {

const endContent = data.slice(anchorPosition);

const slicePositions = endContent.indexOf('{{') + 2;
const slicePositions = endContent.lastIndexOf('{{') + 2;
const newEndContent = `${endContent.slice(0, slicePositions)}${value}${endContent.slice(slicePositions)}`;

const newContent = `${data.slice(0, anchorPosition)}${newEndContent}`;
Expand Down
Loading