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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release #1203

Merged
merged 8 commits into from
Apr 19, 2023
Merged

Release #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12cbbd3
build: update Browserslist db
actions-user Apr 15, 2023
a0ccc8f
Fix editor broken moving between code and config
dlitsman Apr 16, 2023
ae0e105
chore(deps): update all non-major dependencies
renovate[bot] Apr 18, 2023
335c19d
Merge pull request #1201 from mermaid-js/renovate/patch-all-minor-patch
github-merge-queue[bot] Apr 19, 2023
fd189c2
Merge pull request #1199 from mermaid-js/browserslist-update
github-merge-queue[bot] Apr 19, 2023
943b458
Merge pull request #1200 from dlitsman/develop
sidharthv96 Apr 19, 2023
a928f99
Merge branch 'master' into develop
sidharthv96 Apr 19, 2023
6448cbf
Fix editor
sidharthv96 Apr 19, 2023
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
1 change: 1 addition & 0 deletions cypress/e2e/diagramUpdate.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ describe('Auto sync tests', () => {
cy.clearLocalStorage();
cy.visit('/');
cy.url().should('contain', '/edit#pako');
cy.window().should('have.property', 'editorLoaded', true);
});

it('should dim diagram when code is edited', () => {
Expand Down
8 changes: 7 additions & 1 deletion src/lib/components/Editor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
const newText = editorMode === 'code' ? code : mermaid;
if (newText !== text) {
// console.log('updating editor text', newText);
editor.setScrollTop(0);
editor.setValue(newText);
text = newText;
}
Expand Down Expand Up @@ -143,7 +144,12 @@
if (divEl.parentElement) {
resizeObserver.observe(divEl.parentElement);
}
// console.log(`editor mounted`);

// @ts-ignore
if (window.Cypress) {
// @ts-ignore
window.editorLoaded = true;
}
return () => {
// console.log(`editor disposed`);
editor?.dispose();
Expand Down
Loading