docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep replace replace replace keep keep keep keep keep
|
<mask> {
<mask> "ar-SA": 90,
<mask> "bg-BG": 94,
<mask> "ca-ES": 90,
<mask> "de-DE": 100,
<mask> "el-GR": 100,
<mask> "en": 100,
<mask> "es-ES": 100,
<mask> "fa-IR": 98,
</s> chore: Update translations from Crowdin (#2894) </s> remove "he-IL": 90,
"hi-IN": 90,
"hu-HU": 90,
"id-ID": 100,
</s> add "he-IL": 89,
"hi-IN": 89,
"hu-HU": 89,
"id-ID": 99, </s> remove "click": "",
</s> add "click": "klikk", </s> remove "distributeVertically": "Verticaal distribueren"
</s> add "distributeVertically": "Verticaal distribueren",
"viewMode": "" </s> remove "distributeVertically": "Distribusikan vertikal"
</s> add "distributeVertically": "Distribusikan vertikal",
"viewMode": "" </s> remove "tr-TR": 90,
"uk-UA": 100,
"zh-CN": 100,
"zh-TW": 100
</s> add "tr-TR": 89,
"uk-UA": 99,
"zh-CN": 99,
"zh-TW": 99 </s> remove "ru-RU": 100,
"sk-SK": 100,
</s> add "ru-RU": 99,
"sk-SK": 99,
|
https://github.com/excalidraw/excalidraw/commit/f8087e01c85988d68f4209a0ae82c898ed3042fb
|
src/locales/percentages.json
|
keep replace replace replace replace keep keep replace keep keep keep
|
<mask> "fr-FR": 100,
<mask> "he-IL": 90,
<mask> "hi-IN": 90,
<mask> "hu-HU": 90,
<mask> "id-ID": 100,
<mask> "it-IT": 100,
<mask> "ja-JP": 81,
<mask> "ko-KR": 90,
<mask> "my-MM": 83,
<mask> "nb-NO": 100,
<mask> "nl-NL": 100,
</s> chore: Update translations from Crowdin (#2894) </s> add "kab-KAB": "en-kab", </s> remove "nl-NL": 100,
"nn-NO": 90,
"pa-IN": 100,
</s> add "nl-NL": 99,
"nn-NO": 92,
"pa-IN": 99, </s> remove "tr-TR": 90,
"uk-UA": 100,
"zh-CN": 100,
"zh-TW": 100
</s> add "tr-TR": 89,
"uk-UA": 99,
"zh-CN": 99,
"zh-TW": 99 </s> remove "ru-RU": 100,
"sk-SK": 100,
</s> add "ru-RU": 99,
"sk-SK": 99, </s> remove "pt-PT": 100,
</s> add "pt-PT": 99,
|
https://github.com/excalidraw/excalidraw/commit/f8087e01c85988d68f4209a0ae82c898ed3042fb
|
src/locales/percentages.json
|
keep keep keep replace replace replace keep keep replace keep
|
<mask> "ko-KR": 90,
<mask> "my-MM": 83,
<mask> "nb-NO": 100,
<mask> "nl-NL": 100,
<mask> "nn-NO": 90,
<mask> "pa-IN": 100,
<mask> "pl-PL": 90,
<mask> "pt-BR": 100,
<mask> "pt-PT": 100,
<mask> "ro-RO": 100,
</s> chore: Update translations from Crowdin (#2894) </s> remove "ko-KR": 90,
</s> add "kab-KAB": 89,
"ko-KR": 89, </s> add "kab-KAB": "en-kab", </s> remove "ru-RU": 100,
"sk-SK": 100,
</s> add "ru-RU": 99,
"sk-SK": 99, </s> remove "he-IL": 90,
"hi-IN": 90,
"hu-HU": 90,
"id-ID": 100,
</s> add "he-IL": 89,
"hi-IN": 89,
"hu-HU": 89,
"id-ID": 99, </s> remove "tr-TR": 90,
"uk-UA": 100,
"zh-CN": 100,
"zh-TW": 100
</s> add "tr-TR": 89,
"uk-UA": 99,
"zh-CN": 99,
"zh-TW": 99
|
https://github.com/excalidraw/excalidraw/commit/f8087e01c85988d68f4209a0ae82c898ed3042fb
|
src/locales/percentages.json
|
keep replace replace keep replace replace replace replace
|
<mask> "ro-RO": 100,
<mask> "ru-RU": 100,
<mask> "sk-SK": 100,
<mask> "sv-SE": 100,
<mask> "tr-TR": 90,
<mask> "uk-UA": 100,
<mask> "zh-CN": 100,
<mask> "zh-TW": 100
</s> chore: Update translations from Crowdin (#2894) </s> remove "pt-PT": 100,
</s> add "pt-PT": 99, </s> remove "nl-NL": 100,
"nn-NO": 90,
"pa-IN": 100,
</s> add "nl-NL": 99,
"nn-NO": 92,
"pa-IN": 99, </s> remove "ko-KR": 90,
</s> add "kab-KAB": 89,
"ko-KR": 89, </s> remove "he-IL": 90,
"hi-IN": 90,
"hu-HU": 90,
"id-ID": 100,
</s> add "he-IL": 89,
"hi-IN": 89,
"hu-HU": 89,
"id-ID": 99, </s> remove "ar-SA": 90,
"bg-BG": 94,
"ca-ES": 90,
</s> add "ar-SA": 89,
"bg-BG": 93,
"ca-ES": 89,
|
https://github.com/excalidraw/excalidraw/commit/f8087e01c85988d68f4209a0ae82c898ed3042fb
|
src/locales/percentages.json
|
keep add keep keep keep keep
|
<mask> id?: string;
<mask> size?: ToolIconSize;
<mask> };
<mask>
<mask> type ToolButtonProps =
<mask> | (ToolButtonBaseProps & { type: "button"; onClick?(): void })
</s> Add keybindings for shapes (#648)
* Add keybindings for shapes
I'm not 100% sure about this one. I feel like it's going to help people be a lot more productive to display the key bindings at all time. But it also clutters the UI...
* increase font-size
* fix shape keybindings for non-qwerty keyboards
* tweak position and color
Co-authored-by: David Luzar <[email protected]> </s> remove !event.shiftKey &&
</s> add </s> remove <div className="ToolIcon__icon">{props.icon}</div>
</s> add <div className="ToolIcon__icon">
{props.icon}
{props.keyBindingLabel && (
<span className="ToolIcon__keybinding">{props.keyBindingLabel}</span>
)}
</div>
|
https://github.com/excalidraw/excalidraw/commit/f8a41cee16081f1caac2bef13edea9e48b202216
|
src/components/ToolButton.tsx
|
keep keep keep keep replace keep keep keep
|
<mask> onChange={props.onChange}
<mask> checked={props.checked}
<mask> ref={innerRef}
<mask> />
<mask> <div className="ToolIcon__icon">{props.icon}</div>
<mask> </label>
<mask> );
<mask> });
</s> Add keybindings for shapes (#648)
* Add keybindings for shapes
I'm not 100% sure about this one. I feel like it's going to help people be a lot more productive to display the key bindings at all time. But it also clutters the UI...
* increase font-size
* fix shape keybindings for non-qwerty keyboards
* tweak position and color
Co-authored-by: David Luzar <[email protected]> </s> remove !event.shiftKey &&
</s> add </s> add keyBindingLabel?: string;
|
https://github.com/excalidraw/excalidraw/commit/f8a41cee16081f1caac2bef13edea9e48b202216
|
src/components/ToolButton.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> event.preventDefault();
<mask> } else if (
<mask> shapesShortcutKeys.includes(event.key.toLowerCase()) &&
<mask> !event.ctrlKey &&
<mask> !event.shiftKey &&
<mask> !event.altKey &&
<mask> !event.metaKey &&
<mask> this.state.draggingElement === null
<mask> ) {
<mask> if (!isHoldingSpace) {
</s> Add keybindings for shapes (#648)
* Add keybindings for shapes
I'm not 100% sure about this one. I feel like it's going to help people be a lot more productive to display the key bindings at all time. But it also clutters the UI...
* increase font-size
* fix shape keybindings for non-qwerty keyboards
* tweak position and color
Co-authored-by: David Luzar <[email protected]> </s> remove <div className="ToolIcon__icon">{props.icon}</div>
</s> add <div className="ToolIcon__icon">
{props.icon}
{props.keyBindingLabel && (
<span className="ToolIcon__keybinding">{props.keyBindingLabel}</span>
)}
</div> </s> add keyBindingLabel?: string;
|
https://github.com/excalidraw/excalidraw/commit/f8a41cee16081f1caac2bef13edea9e48b202216
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> fi
<mask> - name: Construct comment body
<mask> id: getCommentBody
<mask> run: |
<mask> body=$(yarn locales-coverage:description | grep '^[^>]')
<mask> body="${body//'%'/'%25'}"
<mask> body="${body//$'\n'/'%0A'}"
<mask> body="${body//$'\r'/'%0D'}"
<mask> echo ::set-output name=body::$body
<mask>
</s> chore: Update translations from Crowdin (#3166) </s> remove "fileSavedToFilename": "Disimpan ke {filename}"
</s> add "fileSavedToFilename": "Disimpan ke {filename}",
"canvas": "kanvas",
"selection": "pilihan" </s> remove "fileSavedToFilename": "Opgeslagen als {filename}"
</s> add "fileSavedToFilename": "Opgeslagen als {filename}",
"canvas": "canvas",
"selection": "selectie" </s> remove "copyToClipboardAsPng": "Gekopieerd naar klembord als PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} naar klembord gekopieerd als PNG\n({{exportColorScheme}})", </s> remove "fileSavedToFilename": "Lagret til {filename}"
</s> add "fileSavedToFilename": "Lagret til {filename}",
"canvas": "lerret",
"selection": "utvalg" </s> remove "copyToClipboardAsPng": "Kopiert til utklippstavlen som PNG.",
</s> add "copyToClipboardAsPng": "Kopierte {{exportSelection}} til utklippstavlen som PNG\n({{exportColorScheme}})", </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
.github/workflows/locales-coverage.yml
|
keep keep keep keep replace keep keep
|
<mask> "copyStyles": "",
<mask> "copyToClipboard": "",
<mask> "copyToClipboardAsPng": "",
<mask> "fileSaved": "",
<mask> "fileSavedToFilename": ""
<mask> }
<mask> }
</s> chore: Update translations from Crowdin (#3166) </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": "Zapisano jako {filename}"
</s> add "fileSavedToFilename": "Zapisano jako {filename}",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/ar-SA.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "done": "Fet",
<mask> "edit": "Editar",
<mask> "undo": "Desfer",
<mask> "redo": "Refer",
<mask> "resetLibrary": "",
<mask> "createNewRoom": "Crear sala nova",
<mask> "fullScreen": "Pantalla completa",
<mask> "darkMode": "Mode fosc",
<mask> "lightMode": "Mode clar",
<mask> "zenMode": "Mode Zen",
</s> chore: Update translations from Crowdin (#3166) </s> remove "draw": "",
</s> add "draw": "Dessenh liure", </s> remove "drag": "",
</s> add "drag": "lisar", </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/ca-ES.json
|
keep keep keep keep replace keep keep
|
<mask> "copyStyles": "",
<mask> "copyToClipboard": "",
<mask> "copyToClipboardAsPng": "",
<mask> "fileSaved": "",
<mask> "fileSavedToFilename": ""
<mask> }
<mask> }
</s> chore: Update translations from Crowdin (#3166)
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/ca-ES.json
|
keep keep replace keep replace keep
|
<mask> "copyStyles": "Formatierung kopiert.",
<mask> "copyToClipboard": "In die Zwischenablage kopiert.",
<mask> "copyToClipboardAsPng": "In die Zwischenablage als PNG kopiert.",
<mask> "fileSaved": "Datei gespeichert.",
<mask> "fileSavedToFilename": "Als {filename} gespeichert"
<mask> }
</s> chore: Update translations from Crowdin (#3166) </s> remove "fileSavedToFilename": "Opgeslagen als {filename}"
</s> add "fileSavedToFilename": "Opgeslagen als {filename}",
"canvas": "canvas",
"selection": "selectie" </s> remove "copyToClipboardAsPng": "Gekopieerd naar klembord als PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} naar klembord gekopieerd als PNG\n({{exportColorScheme}})", </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/de-DE.json
|
keep keep keep keep replace keep keep keep keep
|
<mask> },
<mask> "toast": {
<mask> "copyStyles": "Estilos copiados.",
<mask> "copyToClipboard": "Copiado en el portapapeles.",
<mask> "copyToClipboardAsPng": "Copiado al portapapeles como PNG.",
<mask> "fileSaved": "Archivo guardado.",
<mask> "fileSavedToFilename": "Guardado en {filename}"
<mask> }
<mask> }
</s> chore: Update translations from Crowdin (#3166) </s> remove "copyToClipboardAsPng": "Skopiowano do schowka jako PNG.",
</s> add "copyToClipboardAsPng": "", </s> remove "copyToClipboardAsPng": "Copiato negli appunti come PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} copiato negli appunti come PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Kopierat till urklipp som PNG.",
</s> add "copyToClipboardAsPng": "Kopierade {{exportSelection}} till urklipp som PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Kopiert til utklippstavlen som PNG.",
</s> add "copyToClipboardAsPng": "Kopierte {{exportSelection}} til utklippstavlen som PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Gekopieerd naar klembord als PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} naar klembord gekopieerd als PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Tersalin ke clipboard sebagai PNG.",
</s> add "copyToClipboardAsPng": "Tersalin {{exportSelection}} ke clipboard sebagai PNG\n({{exportColorScheme}})",
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/es-ES.json
|
keep keep keep keep replace keep keep
|
<mask> "copyStyles": "",
<mask> "copyToClipboard": "",
<mask> "copyToClipboardAsPng": "",
<mask> "fileSaved": "",
<mask> "fileSavedToFilename": ""
<mask> }
<mask> }
</s> chore: Update translations from Crowdin (#3166)
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/hu-HU.json
|
keep keep keep keep replace keep replace
|
<mask> },
<mask> "toast": {
<mask> "copyStyles": "Gaya tersalin.",
<mask> "copyToClipboard": "Tersalin ke papan klip.",
<mask> "copyToClipboardAsPng": "Tersalin ke clipboard sebagai PNG.",
<mask> "fileSaved": "File tersimpan.",
<mask> "fileSavedToFilename": "Disimpan ke {filename}"
</s> chore: Update translations from Crowdin (#3166) </s> remove "copyToClipboardAsPng": "Copiato negli appunti come PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} copiato negli appunti come PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Skopiowano do schowka jako PNG.",
</s> add "copyToClipboardAsPng": "", </s> remove "fileSavedToFilename": "Salvato in {filename}"
</s> add "fileSavedToFilename": "Salvato in {filename}",
"canvas": "tela",
"selection": "selezione" </s> remove "copyToClipboardAsPng": "Kopiert til utklippstavlen som PNG.",
</s> add "copyToClipboardAsPng": "Kopierte {{exportSelection}} til utklippstavlen som PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Kopierat till urklipp som PNG.",
</s> add "copyToClipboardAsPng": "Kopierade {{exportSelection}} till urklipp som PNG\n({{exportColorScheme}})",
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/id-ID.json
|
keep replace keep replace keep
|
<mask> "copyToClipboard": "Copiato negli appunti.",
<mask> "copyToClipboardAsPng": "Copiato negli appunti come PNG.",
<mask> "fileSaved": "File salvato.",
<mask> "fileSavedToFilename": "Salvato in {filename}"
<mask> }
</s> chore: Update translations from Crowdin (#3166) </s> remove "fileSavedToFilename": "Disimpan ke {filename}"
</s> add "fileSavedToFilename": "Disimpan ke {filename}",
"canvas": "kanvas",
"selection": "pilihan" </s> remove "copyToClipboardAsPng": "Tersalin ke clipboard sebagai PNG.",
</s> add "copyToClipboardAsPng": "Tersalin {{exportSelection}} ke clipboard sebagai PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "In die Zwischenablage als PNG kopiert.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} als PNG in die Zwischenablage kopiert\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Skopiowano do schowka jako PNG.",
</s> add "copyToClipboardAsPng": "", </s> remove "fileSavedToFilename": "Zapisano jako {filename}"
</s> add "fileSavedToFilename": "Zapisano jako {filename}",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/it-IT.json
|
keep keep keep keep replace keep keep
|
<mask> "copyStyles": "",
<mask> "copyToClipboard": "",
<mask> "copyToClipboardAsPng": "",
<mask> "fileSaved": "",
<mask> "fileSavedToFilename": ""
<mask> }
<mask> }
</s> chore: Update translations from Crowdin (#3166)
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/my-MM.json
|
keep replace keep replace keep
|
<mask> "copyToClipboard": "Kopiert til utklippstavlen.",
<mask> "copyToClipboardAsPng": "Kopiert til utklippstavlen som PNG.",
<mask> "fileSaved": "Fil lagret.",
<mask> "fileSavedToFilename": "Lagret til {filename}"
<mask> }
</s> chore: Update translations from Crowdin (#3166) </s> remove "copyToClipboardAsPng": "Kopierat till urklipp som PNG.",
</s> add "copyToClipboardAsPng": "Kopierade {{exportSelection}} till urklipp som PNG\n({{exportColorScheme}})", </s> remove "fileSavedToFilename": "Sparad till {filename}"
</s> add "fileSavedToFilename": "Sparad till {filename}",
"canvas": "canvas",
"selection": "markering" </s> remove "copyToClipboardAsPng": "Skopiowano do schowka jako PNG.",
</s> add "copyToClipboardAsPng": "", </s> remove "fileSavedToFilename": "Zapisano jako {filename}"
</s> add "fileSavedToFilename": "Zapisano jako {filename}",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": "Salvato in {filename}"
</s> add "fileSavedToFilename": "Salvato in {filename}",
"canvas": "tela",
"selection": "selezione"
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/nb-NO.json
|
keep keep keep keep replace keep replace keep
|
<mask> },
<mask> "toast": {
<mask> "copyStyles": "Stijlen gekopieerd.",
<mask> "copyToClipboard": "Gekopieerd naar het klembord.",
<mask> "copyToClipboardAsPng": "Gekopieerd naar klembord als PNG.",
<mask> "fileSaved": "Bestand opgeslagen.",
<mask> "fileSavedToFilename": "Opgeslagen als {filename}"
<mask> }
</s> chore: Update translations from Crowdin (#3166) </s> remove "copyToClipboardAsPng": "In die Zwischenablage als PNG kopiert.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} als PNG in die Zwischenablage kopiert\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Skopiowano do schowka jako PNG.",
</s> add "copyToClipboardAsPng": "", </s> remove "fileSavedToFilename": "Als {filename} gespeichert"
</s> add "fileSavedToFilename": "Als {filename} gespeichert",
"canvas": "Leinwand",
"selection": "Auswahl" </s> remove "copyToClipboardAsPng": "Copiato negli appunti come PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} copiato negli appunti come PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Kopiert til utklippstavlen som PNG.",
</s> add "copyToClipboardAsPng": "Kopierte {{exportSelection}} til utklippstavlen som PNG\n({{exportColorScheme}})",
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/nl-NL.json
|
keep keep keep keep replace keep keep
|
<mask> "copyStyles": "",
<mask> "copyToClipboard": "",
<mask> "copyToClipboardAsPng": "",
<mask> "fileSaved": "",
<mask> "fileSavedToFilename": ""
<mask> }
<mask> }
</s> chore: Update translations from Crowdin (#3166)
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/nn-NO.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "resetLibrary": ""
<mask> },
<mask> "toolBar": {
<mask> "selection": "Seleccion",
<mask> "draw": "",
<mask> "rectangle": "Rectangle",
<mask> "diamond": "",
<mask> "ellipse": "",
<mask> "arrow": "",
<mask> "line": "Linha",
</s> chore: Update translations from Crowdin (#3166) </s> remove "title": ""
</s> add "title": "Error" </s> remove "resetLibrary": "",
</s> add "resetLibrary": "Restablir biblioteca", </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/oc-FR.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "linearElementMulti": "",
<mask> "lockAngle": "",
<mask> "resize": "",
<mask> "rotate": "",
<mask> "lineEditor_info": "",
<mask> "lineEditor_pointSelected": "",
<mask> "lineEditor_nothingSelected": ""
<mask> },
<mask> "canvasError": {
<mask> "cannotShowPreview": "",
</s> chore: Update translations from Crowdin (#3166) </s> remove "title": ""
</s> add "title": "Error" </s> remove "draw": "",
</s> add "draw": "Dessenh liure", </s> remove "angle": "",
</s> add "angle": "Angle", </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/oc-FR.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "desc_shareLink": "",
<mask> "desc_exitSession": ""
<mask> },
<mask> "errorDialog": {
<mask> "title": ""
<mask> },
<mask> "helpDialog": {
<mask> "blog": "",
<mask> "click": "",
<mask> "curvedArrow": "",
</s> chore: Update translations from Crowdin (#3166) </s> remove "zoomToFit": "",
"zoomToSelection": ""
</s> add "zoomToFit": "Zoomar per veire totes los elements",
"zoomToSelection": "Zoomar la seleccion" </s> remove "drag": "",
</s> add "drag": "lisar", </s> remove "versionCopy": "",
"versionNotAvailable": "",
</s> add "versionCopy": "Clicar per copiar",
"versionNotAvailable": "Version pas disponibla", </s> remove "angle": "",
</s> add "angle": "Angle", </s> remove "draw": "",
</s> add "draw": "Dessenh liure", </s> remove "lineEditor_info": "",
</s> add "lineEditor_info": "Doble-clicatz o quichatz Entrada per modificar los punts",
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/oc-FR.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "click": "",
<mask> "curvedArrow": "",
<mask> "curvedLine": "",
<mask> "documentation": "Documentacion",
<mask> "drag": "",
<mask> "editor": "Editor",
<mask> "github": "",
<mask> "howto": "",
<mask> "or": "",
<mask> "preventBinding": "",
</s> chore: Update translations from Crowdin (#3166) </s> remove "title": ""
</s> add "title": "Error" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/oc-FR.json
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> "textFinish": "",
<mask> "textNewLine": "",
<mask> "title": "Ajuda",
<mask> "view": "Vista",
<mask> "zoomToFit": "",
<mask> "zoomToSelection": ""
<mask> },
<mask> "encrypted": {
<mask> "tooltip": ""
<mask> },
<mask> "stats": {
</s> chore: Update translations from Crowdin (#3166) </s> remove "angle": "",
</s> add "angle": "Angle", </s> remove "title": ""
</s> add "title": "Error" </s> remove "versionCopy": "",
"versionNotAvailable": "",
</s> add "versionCopy": "Clicar per copiar",
"versionNotAvailable": "Version pas disponibla", </s> remove "draw": "",
</s> add "draw": "Dessenh liure", </s> remove "lineEditor_info": "",
</s> add "lineEditor_info": "Doble-clicatz o quichatz Entrada per modificar los punts", </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/oc-FR.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "encrypted": {
<mask> "tooltip": ""
<mask> },
<mask> "stats": {
<mask> "angle": "",
<mask> "element": "Element",
<mask> "elements": "Elements",
<mask> "height": "Nautor",
<mask> "scene": "",
<mask> "selected": "",
</s> chore: Update translations from Crowdin (#3166) </s> remove "zoomToFit": "",
"zoomToSelection": ""
</s> add "zoomToFit": "Zoomar per veire totes los elements",
"zoomToSelection": "Zoomar la seleccion" </s> remove "title": ""
</s> add "title": "Error" </s> remove "draw": "",
</s> add "draw": "Dessenh liure", </s> remove "lineEditor_info": "",
</s> add "lineEditor_info": "Doble-clicatz o quichatz Entrada per modificar los punts", </s> remove "versionCopy": "",
"versionNotAvailable": "",
</s> add "versionCopy": "Clicar per copiar",
"versionNotAvailable": "Version pas disponibla", </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/oc-FR.json
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> "storage": "",
<mask> "title": "",
<mask> "total": "",
<mask> "version": "Version",
<mask> "versionCopy": "",
<mask> "versionNotAvailable": "",
<mask> "width": "Largor"
<mask> },
<mask> "toast": {
<mask> "copyStyles": "",
<mask> "copyToClipboard": "",
</s> chore: Update translations from Crowdin (#3166) </s> remove "title": ""
</s> add "title": "Error" </s> remove "zoomToFit": "",
"zoomToSelection": ""
</s> add "zoomToFit": "Zoomar per veire totes los elements",
"zoomToSelection": "Zoomar la seleccion" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": "" </s> remove "fileSavedToFilename": ""
</s> add "fileSavedToFilename": "",
"canvas": "",
"selection": ""
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/oc-FR.json
|
keep replace replace replace keep replace
|
<mask> {
<mask> "ar-SA": 85,
<mask> "bg-BG": 97,
<mask> "ca-ES": 85,
<mask> "de-DE": 100,
<mask> "el-GR": 99,
</s> chore: Update translations from Crowdin (#3166) </s> remove "fa-IR": 92,
</s> add "fa-IR": 91, </s> remove "ja-JP": 99,
"kab-KAB": 99,
"ko-KR": 97,
"my-MM": 79,
</s> add "ja-JP": 98,
"kab-KAB": 97,
"ko-KR": 95,
"my-MM": 78, </s> remove "he-IL": 93,
"hi-IN": 95,
"hu-HU": 85,
</s> add "he-IL": 92,
"hi-IN": 94,
"hu-HU": 84, </s> remove "tr-TR": 85,
"uk-UA": 98,
"zh-CN": 100,
</s> add "tr-TR": 84,
"uk-UA": 97,
"zh-CN": 98, </s> remove "pt-PT": 100,
</s> add "pt-PT": 98,
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/percentages.json
|
keep keep replace keep keep replace replace replace keep keep
|
<mask> "en": 100,
<mask> "es-ES": 100,
<mask> "fa-IR": 92,
<mask> "fi-FI": 100,
<mask> "fr-FR": 100,
<mask> "he-IL": 93,
<mask> "hi-IN": 95,
<mask> "hu-HU": 85,
<mask> "id-ID": 100,
<mask> "it-IT": 100,
</s> chore: Update translations from Crowdin (#3166) </s> remove "el-GR": 99,
</s> add "el-GR": 100, </s> remove "ar-SA": 85,
"bg-BG": 97,
"ca-ES": 85,
</s> add "ar-SA": 84,
"bg-BG": 96,
"ca-ES": 95, </s> remove "ja-JP": 99,
"kab-KAB": 99,
"ko-KR": 97,
"my-MM": 79,
</s> add "ja-JP": 98,
"kab-KAB": 97,
"ko-KR": 95,
"my-MM": 78, </s> remove "pt-PT": 100,
</s> add "pt-PT": 98, </s> remove "ru-RU": 100,
"sk-SK": 100,
</s> add "ru-RU": 98,
"sk-SK": 98,
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/percentages.json
|
keep keep keep replace replace replace replace keep keep replace replace replace replace keep keep keep keep
|
<mask> "hu-HU": 85,
<mask> "id-ID": 100,
<mask> "it-IT": 100,
<mask> "ja-JP": 99,
<mask> "kab-KAB": 99,
<mask> "ko-KR": 97,
<mask> "my-MM": 79,
<mask> "nb-NO": 100,
<mask> "nl-NL": 99,
<mask> "nn-NO": 87,
<mask> "oc-FR": 47,
<mask> "pa-IN": 98,
<mask> "pl-PL": 99,
<mask> "pt-BR": 100,
<mask> "pt-PT": 100,
<mask> "ro-RO": 100,
<mask> "ru-RU": 100,
</s> chore: Update translations from Crowdin (#3166) </s> remove "pt-PT": 100,
</s> add "pt-PT": 98, </s> remove "he-IL": 93,
"hi-IN": 95,
"hu-HU": 85,
</s> add "he-IL": 92,
"hi-IN": 94,
"hu-HU": 84, </s> remove "ru-RU": 100,
"sk-SK": 100,
</s> add "ru-RU": 98,
"sk-SK": 98, </s> remove "tr-TR": 85,
"uk-UA": 98,
"zh-CN": 100,
</s> add "tr-TR": 84,
"uk-UA": 97,
"zh-CN": 98, </s> remove "el-GR": 99,
</s> add "el-GR": 100,
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/percentages.json
|
keep keep keep replace keep replace replace
|
<mask> "pa-IN": 98,
<mask> "pl-PL": 99,
<mask> "pt-BR": 100,
<mask> "pt-PT": 100,
<mask> "ro-RO": 100,
<mask> "ru-RU": 100,
<mask> "sk-SK": 100,
</s> chore: Update translations from Crowdin (#3166) </s> remove "nn-NO": 87,
"oc-FR": 47,
"pa-IN": 98,
"pl-PL": 99,
</s> add "nn-NO": 86,
"oc-FR": 93,
"pa-IN": 97,
"pl-PL": 98, </s> remove "tr-TR": 85,
"uk-UA": 98,
"zh-CN": 100,
</s> add "tr-TR": 84,
"uk-UA": 97,
"zh-CN": 98, </s> remove "ja-JP": 99,
"kab-KAB": 99,
"ko-KR": 97,
"my-MM": 79,
</s> add "ja-JP": 98,
"kab-KAB": 97,
"ko-KR": 95,
"my-MM": 78, </s> remove "el-GR": 99,
</s> add "el-GR": 100, </s> remove "fa-IR": 92,
</s> add "fa-IR": 91,
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/percentages.json
|
keep keep keep keep replace replace replace keep keep
|
<mask> "ro-RO": 100,
<mask> "ru-RU": 100,
<mask> "sk-SK": 100,
<mask> "sv-SE": 100,
<mask> "tr-TR": 85,
<mask> "uk-UA": 98,
<mask> "zh-CN": 100,
<mask> "zh-TW": 100
<mask> }
</s> chore: Update translations from Crowdin (#3166) </s> remove "ru-RU": 100,
"sk-SK": 100,
</s> add "ru-RU": 98,
"sk-SK": 98, </s> remove "pt-PT": 100,
</s> add "pt-PT": 98, </s> remove "nn-NO": 87,
"oc-FR": 47,
"pa-IN": 98,
"pl-PL": 99,
</s> add "nn-NO": 86,
"oc-FR": 93,
"pa-IN": 97,
"pl-PL": 98, </s> remove "el-GR": 99,
</s> add "el-GR": 100, </s> remove "fa-IR": 92,
</s> add "fa-IR": 91, </s> remove "ja-JP": 99,
"kab-KAB": 99,
"ko-KR": 97,
"my-MM": 79,
</s> add "ja-JP": 98,
"kab-KAB": 97,
"ko-KR": 95,
"my-MM": 78,
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/percentages.json
|
keep keep keep keep replace keep replace
|
<mask> },
<mask> "toast": {
<mask> "copyStyles": "Skopiowano style.",
<mask> "copyToClipboard": "Skopiowano do schowka.",
<mask> "copyToClipboardAsPng": "Skopiowano do schowka jako PNG.",
<mask> "fileSaved": "Zapisano plik.",
<mask> "fileSavedToFilename": "Zapisano jako {filename}"
</s> chore: Update translations from Crowdin (#3166) </s> remove "copyToClipboardAsPng": "Copiato negli appunti come PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} copiato negli appunti come PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Kopiert til utklippstavlen som PNG.",
</s> add "copyToClipboardAsPng": "Kopierte {{exportSelection}} til utklippstavlen som PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Kopierat till urklipp som PNG.",
</s> add "copyToClipboardAsPng": "Kopierade {{exportSelection}} till urklipp som PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Gekopieerd naar klembord als PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} naar klembord gekopieerd als PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Copiado al portapapeles como PNG.",
</s> add "copyToClipboardAsPng": "Copiado {{exportSelection}} al portapapeles como PNG\n({{exportColorScheme}})",
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/pl-PL.json
|
keep keep keep replace keep replace
|
<mask> "toast": {
<mask> "copyStyles": "Kopierade stilar.",
<mask> "copyToClipboard": "Kopierad till urklipp.",
<mask> "copyToClipboardAsPng": "Kopierat till urklipp som PNG.",
<mask> "fileSaved": "Fil sparad.",
<mask> "fileSavedToFilename": "Sparad till {filename}"
</s> chore: Update translations from Crowdin (#3166) </s> remove "copyToClipboardAsPng": "Kopiert til utklippstavlen som PNG.",
</s> add "copyToClipboardAsPng": "Kopierte {{exportSelection}} til utklippstavlen som PNG\n({{exportColorScheme}})", </s> remove "fileSavedToFilename": "Lagret til {filename}"
</s> add "fileSavedToFilename": "Lagret til {filename}",
"canvas": "lerret",
"selection": "utvalg" </s> remove "copyToClipboardAsPng": "Skopiowano do schowka jako PNG.",
</s> add "copyToClipboardAsPng": "", </s> remove "copyToClipboardAsPng": "Copiato negli appunti come PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} copiato negli appunti come PNG\n({{exportColorScheme}})", </s> remove "copyToClipboardAsPng": "Gekopieerd naar klembord als PNG.",
</s> add "copyToClipboardAsPng": "{{exportSelection}} naar klembord gekopieerd als PNG\n({{exportColorScheme}})",
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/sv-SE.json
|
keep keep keep keep replace keep keep
|
<mask> "copyStyles": "",
<mask> "copyToClipboard": "",
<mask> "copyToClipboardAsPng": "",
<mask> "fileSaved": "",
<mask> "fileSavedToFilename": ""
<mask> }
<mask> }
</s> chore: Update translations from Crowdin (#3166)
|
https://github.com/excalidraw/excalidraw/commit/f8c3c431da9ffedd8341e8f30dbe6b56779c4d3e
|
src/locales/tr-TR.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> } from "./element";
<mask> import {
<mask> clearSelection,
<mask> deleteSelectedElements,
<mask> getElementsWithinSelection,
<mask> isOverScrollBars,
<mask> restoreFromLocalStorage,
<mask> saveToLocalStorage,
<mask> getElementAtPosition,
<mask> createScene,
</s> Revert "Shift drag to add to selection (#350)" (#352)
This reverts commit ce467f7b6572615c5f4050f3e514943867b6fb9d. </s> remove getElementsWithinSelection,
</s> add setSelection, </s> remove export function getElementsWithinSelection(
</s> add export function setSelection( </s> add return elements; </s> remove const elementsWithinSelection = getElementsWithinSelection(
elements,
draggingElement
);
if (!e.shiftKey) {
elements = clearSelection(elements);
}
elementsWithinSelection.forEach(
element => (element.isSelected = true)
);
</s> add elements = setSelection(elements, draggingElement); </s> remove selectionY2 >= elementY2
);
</s> add selectionY2 >= elementY2; </s> remove
return elements.filter(element => {
</s> add elements.forEach(element => {
|
https://github.com/excalidraw/excalidraw/commit/f91b708abb5d39ce2db5e67a6a718854ef6d8390
|
src/index.tsx
|
keep keep keep keep replace replace replace replace replace keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep
|
<mask> draggingElement.y -
<mask> this.state.scrollY;
<mask> draggingElement.width = width;
<mask> // Make a perfect square or circle when shift is enabled
<mask> draggingElement.height =
<mask> // Shift key on selection must add items to selection
<mask> e.shiftKey && this.state.elementType !== "selection"
<mask> ? Math.abs(width) * Math.sign(height)
<mask> : height;
<mask> draggingElement.shape = null;
<mask>
<mask> if (this.state.elementType === "selection") {
<mask> const elementsWithinSelection = getElementsWithinSelection(
<mask> elements,
<mask> draggingElement
<mask> );
<mask> if (!e.shiftKey) {
<mask> elements = clearSelection(elements);
<mask> }
<mask> elementsWithinSelection.forEach(
<mask> element => (element.isSelected = true)
<mask> );
<mask> }
<mask> // We don't want to save history when moving an element
<mask> history.skipRecording();
<mask> this.forceUpdate();
</s> Revert "Shift drag to add to selection (#350)" (#352)
This reverts commit ce467f7b6572615c5f4050f3e514943867b6fb9d. </s> remove selectionY2 >= elementY2
);
</s> add selectionY2 >= elementY2; </s> add return elements; </s> remove return (
</s> add element.isSelected = </s> remove
return elements.filter(element => {
</s> add elements.forEach(element => { </s> remove export function getElementsWithinSelection(
</s> add export function setSelection(
|
https://github.com/excalidraw/excalidraw/commit/f91b708abb5d39ce2db5e67a6a718854ef6d8390
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> clearSelection,
<mask> getSelectedIndices,
<mask> deleteSelectedElements,
<mask> someElementIsSelected,
<mask> getElementsWithinSelection,
<mask> getSelectedAttribute
<mask> } from "./selection";
<mask> export {
<mask> exportCanvas,
<mask> loadFromJSON,
</s> Revert "Shift drag to add to selection (#350)" (#352)
This reverts commit ce467f7b6572615c5f4050f3e514943867b6fb9d. </s> remove getElementsWithinSelection,
</s> add setSelection, </s> remove export function getElementsWithinSelection(
</s> add export function setSelection( </s> add return elements; </s> remove selectionY2 >= elementY2
);
</s> add selectionY2 >= elementY2; </s> remove const elementsWithinSelection = getElementsWithinSelection(
elements,
draggingElement
);
if (!e.shiftKey) {
elements = clearSelection(elements);
}
elementsWithinSelection.forEach(
element => (element.isSelected = true)
);
</s> add elements = setSelection(elements, draggingElement); </s> remove
return elements.filter(element => {
</s> add elements.forEach(element => {
|
https://github.com/excalidraw/excalidraw/commit/f91b708abb5d39ce2db5e67a6a718854ef6d8390
|
src/scene/index.ts
|
keep keep keep replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { getElementAbsoluteCoords } from "../element";
<mask>
<mask> export function getElementsWithinSelection(
<mask> elements: readonly ExcalidrawElement[],
<mask> selection: ExcalidrawElement
<mask> ) {
<mask> const [
<mask> selectionX1,
</s> Revert "Shift drag to add to selection (#350)" (#352)
This reverts commit ce467f7b6572615c5f4050f3e514943867b6fb9d. </s> remove getElementsWithinSelection,
</s> add setSelection, </s> add return elements; </s> remove getElementsWithinSelection,
</s> add setSelection, </s> remove
return elements.filter(element => {
</s> add elements.forEach(element => { </s> remove selectionY2 >= elementY2
);
</s> add selectionY2 >= elementY2; </s> remove const elementsWithinSelection = getElementsWithinSelection(
elements,
draggingElement
);
if (!e.shiftKey) {
elements = clearSelection(elements);
}
elementsWithinSelection.forEach(
element => (element.isSelected = true)
);
</s> add elements = setSelection(elements, draggingElement);
|
https://github.com/excalidraw/excalidraw/commit/f91b708abb5d39ce2db5e67a6a718854ef6d8390
|
src/scene/selection.ts
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> selectionY1,
<mask> selectionX2,
<mask> selectionY2
<mask> ] = getElementAbsoluteCoords(selection);
<mask>
<mask> return elements.filter(element => {
<mask> const [
<mask> elementX1,
<mask> elementY1,
<mask> elementX2,
<mask> elementY2
</s> Revert "Shift drag to add to selection (#350)" (#352)
This reverts commit ce467f7b6572615c5f4050f3e514943867b6fb9d. </s> remove return (
</s> add element.isSelected = </s> add return elements; </s> remove export function getElementsWithinSelection(
</s> add export function setSelection( </s> remove selectionY2 >= elementY2
);
</s> add selectionY2 >= elementY2; </s> remove const elementsWithinSelection = getElementsWithinSelection(
elements,
draggingElement
);
if (!e.shiftKey) {
elements = clearSelection(elements);
}
elementsWithinSelection.forEach(
element => (element.isSelected = true)
);
</s> add elements = setSelection(elements, draggingElement); </s> remove draggingElement.height =
// Shift key on selection must add items to selection
e.shiftKey && this.state.elementType !== "selection"
? Math.abs(width) * Math.sign(height)
: height;
</s> add draggingElement.height = e.shiftKey
? Math.abs(width) * Math.sign(height)
: height;
|
https://github.com/excalidraw/excalidraw/commit/f91b708abb5d39ce2db5e67a6a718854ef6d8390
|
src/scene/selection.ts
|
keep keep keep keep replace keep keep keep keep replace replace keep keep keep
|
<mask> elementY1,
<mask> elementX2,
<mask> elementY2
<mask> ] = getElementAbsoluteCoords(element);
<mask> return (
<mask> element.type !== "selection" &&
<mask> selectionX1 <= elementX1 &&
<mask> selectionY1 <= elementY1 &&
<mask> selectionX2 >= elementX2 &&
<mask> selectionY2 >= elementY2
<mask> );
<mask> });
<mask> }
<mask>
</s> Revert "Shift drag to add to selection (#350)" (#352)
This reverts commit ce467f7b6572615c5f4050f3e514943867b6fb9d. </s> remove
return elements.filter(element => {
</s> add elements.forEach(element => { </s> add return elements; </s> remove draggingElement.height =
// Shift key on selection must add items to selection
e.shiftKey && this.state.elementType !== "selection"
? Math.abs(width) * Math.sign(height)
: height;
</s> add draggingElement.height = e.shiftKey
? Math.abs(width) * Math.sign(height)
: height; </s> remove const elementsWithinSelection = getElementsWithinSelection(
elements,
draggingElement
);
if (!e.shiftKey) {
elements = clearSelection(elements);
}
elementsWithinSelection.forEach(
element => (element.isSelected = true)
);
</s> add elements = setSelection(elements, draggingElement); </s> remove export function getElementsWithinSelection(
</s> add export function setSelection(
|
https://github.com/excalidraw/excalidraw/commit/f91b708abb5d39ce2db5e67a6a718854ef6d8390
|
src/scene/selection.ts
|
keep add keep keep keep keep keep keep
|
<mask> selectionY2 >= elementY2;
<mask> });
<mask> }
<mask>
<mask> export function clearSelection(elements: readonly ExcalidrawElement[]) {
<mask> const newElements = [...elements];
<mask>
<mask> newElements.forEach(element => {
</s> Revert "Shift drag to add to selection (#350)" (#352)
This reverts commit ce467f7b6572615c5f4050f3e514943867b6fb9d. </s> remove selectionY2 >= elementY2
);
</s> add selectionY2 >= elementY2; </s> remove export function getElementsWithinSelection(
</s> add export function setSelection( </s> remove
return elements.filter(element => {
</s> add elements.forEach(element => { </s> remove const elementsWithinSelection = getElementsWithinSelection(
elements,
draggingElement
);
if (!e.shiftKey) {
elements = clearSelection(elements);
}
elementsWithinSelection.forEach(
element => (element.isSelected = true)
);
</s> add elements = setSelection(elements, draggingElement); </s> remove getElementsWithinSelection,
</s> add setSelection, </s> remove return (
</s> add element.isSelected =
|
https://github.com/excalidraw/excalidraw/commit/f91b708abb5d39ce2db5e67a6a718854ef6d8390
|
src/scene/selection.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { getDefaultAppState } from "../appState";
<mask> import { trash, zoomIn, zoomOut, resetZoom } from "../components/icons";
<mask> import { ToolButton } from "../components/ToolButton";
<mask> import { t } from "../i18n";
<mask> import { getNormalizedZoom, calculateScrollCenter } from "../scene";
<mask> import { KEYS } from "../keys";
<mask> import { getShortcutKey } from "../utils";
<mask> import useIsMobile from "../is-mobile";
<mask> import { register } from "./register";
<mask> import { newElementWith } from "../element/mutateElement";
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove import { rotate } from "../math";
</s> add import { distance2d, rotate } from "../math"; </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils"; </s> remove import { FlooredNumber } from "../types";
</s> add import { AppState, FlooredNumber } from "../types"; </s> add getClosestElementBounds, </s> remove appState = data.appState || appState;
</s> add appState = { ...appState, ...data.appState }; </s> add appState: AppState,
canvas: HTMLCanvasElement | null,
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/actions/actionCanvas.tsx
|
keep keep replace keep replace keep keep keep keep
|
<mask> perform: (elements, appState) => {
<mask> const nonDeletedElements = elements.filter((element) => !element.isDeleted);
<mask> const scrollCenter = calculateScrollCenter(nonDeletedElements);
<mask> const commonBounds = getCommonBounds(nonDeletedElements);
<mask> const zoom = calculateZoom(commonBounds, appState.zoom, scrollCenter);
<mask>
<mask> return {
<mask> appState: {
<mask> ...appState,
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove scrollX: scrollCenter.scrollX,
scrollY: scrollCenter.scrollY,
</s> add scrollX,
scrollY, </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils"; </s> remove
const [x1, y1, x2, y2] = getCommonBounds(elements);
</s> add const scale = window.devicePixelRatio;
let [x1, y1, x2, y2] = getCommonBounds(elements);
if (isOutsideViewPort(appState, canvas, [x1, y1, x2, y2])) {
[x1, y1, x2, y2] = getClosestElementBounds(
elements,
viewportCoordsToSceneCoords(
{ clientX: appState.scrollX, clientY: appState.scrollY },
appState,
canvas,
scale,
),
);
} </s> remove import { FlooredNumber } from "../types";
</s> add import { AppState, FlooredNumber } from "../types";
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/actions/actionCanvas.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> return {
<mask> appState: {
<mask> ...appState,
<mask> scrollX: scrollCenter.scrollX,
<mask> scrollY: scrollCenter.scrollY,
<mask> zoom,
<mask> },
<mask> commitToHistory: false,
<mask> };
<mask> },
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
}; </s> remove
const [x1, y1, x2, y2] = getCommonBounds(elements);
</s> add const scale = window.devicePixelRatio;
let [x1, y1, x2, y2] = getCommonBounds(elements);
if (isOutsideViewPort(appState, canvas, [x1, y1, x2, y2])) {
[x1, y1, x2, y2] = getClosestElementBounds(
elements,
viewportCoordsToSceneCoords(
{ clientX: appState.scrollX, clientY: appState.scrollY },
appState,
canvas,
scale,
),
);
} </s> remove const zoom = calculateZoom(commonBounds, appState.zoom, scrollCenter);
</s> add const [x1, y1, x2, y2] = commonBounds;
const centerX = (x1 + x2) / 2;
const centerY = (y1 + y2) / 2;
const scrollX = normalizeScroll(window.innerWidth / 2 - centerX);
const scrollY = normalizeScroll(window.innerHeight / 2 - centerY);
const zoom = calculateZoom(commonBounds, appState.zoom, {
scrollX,
scrollY,
}); </s> remove appState = data.appState || appState;
</s> add appState = { ...appState, ...data.appState }; </s> remove const scrollCenter = calculateScrollCenter(nonDeletedElements);
</s> add
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/actions/actionCanvas.tsx
|
keep add keep keep keep keep keep keep
|
<mask> return !element.isDeleted;
<mask> }),
<mask> ),
<mask> });
<mask> }
<mask>
<mask> // Perform reconciliation - in collaboration, if we encounter
<mask> // elements with more staler versions than ours, ignore them
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove appState = data.appState || appState;
</s> add appState = { ...appState, ...data.appState }; </s> remove
const [x1, y1, x2, y2] = getCommonBounds(elements);
</s> add const scale = window.devicePixelRatio;
let [x1, y1, x2, y2] = getCommonBounds(elements);
if (isOutsideViewPort(appState, canvas, [x1, y1, x2, y2])) {
[x1, y1, x2, y2] = getClosestElementBounds(
elements,
viewportCoordsToSceneCoords(
{ clientX: appState.scrollX, clientY: appState.scrollY },
appState,
canvas,
scale,
),
);
} </s> remove const zoom = calculateZoom(commonBounds, appState.zoom, scrollCenter);
</s> add const [x1, y1, x2, y2] = commonBounds;
const centerX = (x1 + x2) / 2;
const centerY = (y1 + y2) / 2;
const scrollX = normalizeScroll(window.innerWidth / 2 - centerX);
const scrollY = normalizeScroll(window.innerHeight / 2 - centerY);
const zoom = calculateZoom(commonBounds, appState.zoom, {
scrollX,
scrollY,
}); </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
}; </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> remove setAppState({ ...calculateScrollCenter(elements) });
</s> add setAppState({
...calculateScrollCenter(elements, appState, canvas),
});
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> {appState.scrolledOutside && (
<mask> <button
<mask> className="scroll-back-to-content"
<mask> onClick={() => {
<mask> setAppState({ ...calculateScrollCenter(elements) });
<mask> }}
<mask> >
<mask> {t("buttons.scrollBackToContent")}
<mask> </button>
<mask> )}
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove setAppState({ ...calculateScrollCenter(elements) });
</s> add setAppState({
...calculateScrollCenter(elements, appState, canvas),
}); </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
}; </s> add canvas, </s> add canvas={canvas} </s> remove appState = data.appState || appState;
</s> add appState = { ...appState, ...data.appState }; </s> add appState: AppState,
canvas: HTMLCanvasElement | null,
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/components/LayerUI.tsx
|
keep keep add keep keep keep keep
|
<mask> onRoomCreate={onRoomCreate}
<mask> onRoomDestroy={onRoomDestroy}
<mask> onLockToggle={onLockToggle}
<mask> />
<mask> ) : (
<mask> <div className="layer-ui__wrapper">
<mask> {appState.isLoading && <LoadingMessage />}
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> add canvas, </s> remove setAppState({ ...calculateScrollCenter(elements) });
</s> add setAppState({
...calculateScrollCenter(elements, appState, canvas),
}); </s> remove setAppState({ ...calculateScrollCenter(elements) });
</s> add setAppState({
...calculateScrollCenter(elements, appState, canvas),
}); </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
}; </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils";
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/components/LayerUI.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> onRoomCreate: () => void;
<mask> onUsernameChange: (username: string) => void;
<mask> onRoomDestroy: () => void;
<mask> onLockToggle: () => void;
<mask> };
<mask>
<mask> export const MobileMenu = ({
<mask> appState,
<mask> elements,
<mask> actionManager,
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove
const [x1, y1, x2, y2] = getCommonBounds(elements);
</s> add const scale = window.devicePixelRatio;
let [x1, y1, x2, y2] = getCommonBounds(elements);
if (isOutsideViewPort(appState, canvas, [x1, y1, x2, y2])) {
[x1, y1, x2, y2] = getClosestElementBounds(
elements,
viewportCoordsToSceneCoords(
{ clientX: appState.scrollX, clientY: appState.scrollY },
appState,
canvas,
scale,
),
);
} </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
}; </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> remove appState = data.appState || appState;
</s> add appState = { ...appState, ...data.appState }; </s> remove const scrollCenter = calculateScrollCenter(nonDeletedElements);
</s> add </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils";
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/components/MobileMenu.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> onRoomCreate,
<mask> onUsernameChange,
<mask> onRoomDestroy,
<mask> onLockToggle,
<mask> }: MobileMenuProps) => (
<mask> <>
<mask> {appState.isLoading && <LoadingMessage />}
<mask> <FixedSideContainer side="top">
<mask> <Section heading="shapes">
<mask> {(heading) => (
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> add canvas={canvas} </s> remove setAppState({ ...calculateScrollCenter(elements) });
</s> add setAppState({
...calculateScrollCenter(elements, appState, canvas),
}); </s> remove setAppState({ ...calculateScrollCenter(elements) });
</s> add setAppState({
...calculateScrollCenter(elements, appState, canvas),
}); </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils"; </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
};
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> {appState.scrolledOutside && (
<mask> <button
<mask> className="scroll-back-to-content"
<mask> onClick={() => {
<mask> setAppState({ ...calculateScrollCenter(elements) });
<mask> }}
<mask> >
<mask> {t("buttons.scrollBackToContent")}
<mask> </button>
<mask> )}
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]>
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/components/MobileMenu.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> data = await response.json();
<mask> }
<mask>
<mask> elements = data.elements || elements;
<mask> appState = data.appState || appState;
<mask> } catch (error) {
<mask> window.alert(t("alerts.importBackendFailed"));
<mask> console.error(error);
<mask> } finally {
<mask> return restore(elements, appState, { scrollToContent: true });
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
}; </s> remove import { getNormalizedZoom, calculateScrollCenter } from "../scene";
</s> add import { getNormalizedZoom, normalizeScroll } from "../scene"; </s> remove import { rotate } from "../math";
</s> add import { distance2d, rotate } from "../math"; </s> remove import { FlooredNumber } from "../types";
</s> add import { AppState, FlooredNumber } from "../types"; </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils"; </s> add this.state,
this.canvas,
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/data/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return elements;
<mask> }, [] as ExcalidrawElement[]);
<mask>
<mask> if (opts?.scrollToContent && savedState) {
<mask> savedState = { ...savedState, ...calculateScrollCenter(elements) };
<mask> }
<mask>
<mask> return {
<mask> elements: elements,
<mask> appState: savedState,
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> remove scrollX: scrollCenter.scrollX,
scrollY: scrollCenter.scrollY,
</s> add scrollX,
scrollY, </s> remove appState = data.appState || appState;
</s> add appState = { ...appState, ...data.appState }; </s> remove
const [x1, y1, x2, y2] = getCommonBounds(elements);
</s> add const scale = window.devicePixelRatio;
let [x1, y1, x2, y2] = getCommonBounds(elements);
if (isOutsideViewPort(appState, canvas, [x1, y1, x2, y2])) {
[x1, y1, x2, y2] = getClosestElementBounds(
elements,
viewportCoordsToSceneCoords(
{ clientX: appState.scrollX, clientY: appState.scrollY },
appState,
canvas,
scale,
),
);
} </s> remove import { FlooredNumber } from "../types";
</s> add import { AppState, FlooredNumber } from "../types"; </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils";
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/data/restore.ts
|
keep replace keep keep keep keep keep
|
<mask> import { ExcalidrawElement, ExcalidrawLinearElement } from "./types";
<mask> import { rotate } from "../math";
<mask> import rough from "roughjs/bin/rough";
<mask> import { Drawable, Op } from "roughjs/bin/core";
<mask> import { Point } from "../types";
<mask> import {
<mask> getShapeForElement,
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove import { getNormalizedZoom, calculateScrollCenter } from "../scene";
</s> add import { getNormalizedZoom, normalizeScroll } from "../scene"; </s> remove import { FlooredNumber } from "../types";
</s> add import { AppState, FlooredNumber } from "../types"; </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils"; </s> add getClosestElementBounds, </s> remove appState = data.appState || appState;
</s> add appState = { ...appState, ...data.appState }; </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
};
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/element/bounds.ts
|
keep add keep keep keep keep
|
<mask> getDiamondPoints,
<mask> getArrowPoints,
<mask> } from "./bounds";
<mask>
<mask> export {
<mask> OMIT_SIDES_FOR_MULTIPLE_ELEMENTS,
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils"; </s> remove import { FlooredNumber } from "../types";
</s> add import { AppState, FlooredNumber } from "../types"; </s> remove import { getNormalizedZoom, calculateScrollCenter } from "../scene";
</s> add import { getNormalizedZoom, normalizeScroll } from "../scene"; </s> remove import { rotate } from "../math";
</s> add import { distance2d, rotate } from "../math"; </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> remove appState = data.appState || appState;
</s> add appState = { ...appState, ...data.appState };
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/element/index.ts
|
replace keep replace keep keep keep keep keep
|
<mask> import { FlooredNumber } from "../types";
<mask> import { ExcalidrawElement } from "../element/types";
<mask> import { getCommonBounds } from "../element";
<mask>
<mask> export const normalizeScroll = (pos: number) =>
<mask> Math.floor(pos) as FlooredNumber;
<mask>
<mask> export const calculateScrollCenter = (
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove import { getNormalizedZoom, calculateScrollCenter } from "../scene";
</s> add import { getNormalizedZoom, normalizeScroll } from "../scene"; </s> remove import { rotate } from "../math";
</s> add import { distance2d, rotate } from "../math"; </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> add getClosestElementBounds, </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
};
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/scene/scroll.ts
|
keep keep add keep keep keep keep keep keep
|
<mask>
<mask> export const calculateScrollCenter = (
<mask> elements: readonly ExcalidrawElement[],
<mask> ): { scrollX: FlooredNumber; scrollY: FlooredNumber } => {
<mask> if (!elements.length) {
<mask> return {
<mask> scrollX: normalizeScroll(0),
<mask> scrollY: normalizeScroll(0),
<mask> };
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove
const [x1, y1, x2, y2] = getCommonBounds(elements);
</s> add const scale = window.devicePixelRatio;
let [x1, y1, x2, y2] = getCommonBounds(elements);
if (isOutsideViewPort(appState, canvas, [x1, y1, x2, y2])) {
[x1, y1, x2, y2] = getClosestElementBounds(
elements,
viewportCoordsToSceneCoords(
{ clientX: appState.scrollX, clientY: appState.scrollY },
appState,
canvas,
scale,
),
);
} </s> remove scrollX: scrollCenter.scrollX,
scrollY: scrollCenter.scrollY,
</s> add scrollX,
scrollY, </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils"; </s> remove import { FlooredNumber } from "../types";
</s> add import { AppState, FlooredNumber } from "../types"; </s> remove savedState = { ...savedState, ...calculateScrollCenter(elements) };
</s> add savedState = {
...savedState,
...calculateScrollCenter(elements, savedState, null),
}; </s> remove import { getNormalizedZoom, calculateScrollCenter } from "../scene";
</s> add import { getNormalizedZoom, normalizeScroll } from "../scene";
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/scene/scroll.ts
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> scrollX: normalizeScroll(0),
<mask> scrollY: normalizeScroll(0),
<mask> };
<mask> }
<mask>
<mask> const [x1, y1, x2, y2] = getCommonBounds(elements);
<mask>
<mask> const centerX = (x1 + x2) / 2;
<mask> const centerY = (y1 + y2) / 2;
<mask>
<mask> return {
</s> scroll the closest element to center (#1670)
Co-authored-by: Sanghyeon Lee <[email protected]> </s> remove const zoom = calculateZoom(commonBounds, appState.zoom, scrollCenter);
</s> add const [x1, y1, x2, y2] = commonBounds;
const centerX = (x1 + x2) / 2;
const centerY = (y1 + y2) / 2;
const scrollX = normalizeScroll(window.innerWidth / 2 - centerX);
const scrollY = normalizeScroll(window.innerHeight / 2 - centerY);
const zoom = calculateZoom(commonBounds, appState.zoom, {
scrollX,
scrollY,
}); </s> add appState: AppState,
canvas: HTMLCanvasElement | null, </s> remove scrollX: scrollCenter.scrollX,
scrollY: scrollCenter.scrollY,
</s> add scrollX,
scrollY, </s> remove import { getCommonBounds } from "../element";
</s> add import { getCommonBounds, getClosestElementBounds } from "../element";
import {
sceneCoordsToViewportCoords,
viewportCoordsToSceneCoords,
} from "../utils"; </s> remove const scrollCenter = calculateScrollCenter(nonDeletedElements);
</s> add </s> remove import { FlooredNumber } from "../types";
</s> add import { AppState, FlooredNumber } from "../types";
|
https://github.com/excalidraw/excalidraw/commit/fa359034c51547c54929000a09db5596817db5f9
|
src/scene/scroll.ts
|
keep add keep keep keep keep keep keep
|
<mask> import colors from "../colors";
<mask>
<mask> // This is a narrow reimplementation of the awesome react-color Twitter component
<mask> // https://github.com/casesandberg/react-color/blob/master/src/components/twitter/Twitter.js
<mask>
<mask> // Unfortunately, we can't detect keyboard layout in the browser. So this will
<mask> // only work well for QWERTY but not AZERTY or others...
<mask> const keyBindings = [
</s> Support different color inputs (#1478) (#1479) </s> add const canvasContext = React.useRef<CanvasRenderingContext2D>(
document.createElement("canvas").getContext("2d"),
); </s> add } else if (canvasContext.current) {
const hexColor = standardizeColor(value, canvasContext.current);
if (hexColor) {
onChange(hexColor);
}
|
https://github.com/excalidraw/excalidraw/commit/fa8354e306f43d7b76d750b96b8e9de5fab21c8b
|
src/components/ColorPicker.tsx
|
keep keep add keep keep keep keep keep keep
|
<mask> const colorRegex = /^([0-9a-f]{3}|[0-9a-f]{6}|[0-9a-f]{8}|transparent)$/;
<mask> const [innerValue, setInnerValue] = React.useState(color);
<mask> const inputRef = React.useRef(null);
<mask>
<mask> React.useEffect(() => {
<mask> setInnerValue(color);
<mask> }, [color]);
<mask>
<mask> React.useImperativeHandle(ref, () => inputRef.current);
</s> Support different color inputs (#1478) (#1479) </s> add } else if (canvasContext.current) {
const hexColor = standardizeColor(value, canvasContext.current);
if (hexColor) {
onChange(hexColor);
} </s> add const standardizeColor = (
value: string,
canvasContext: CanvasRenderingContext2D,
): string | null => {
const defaultHexColor = "#000000";
canvasContext.fillStyle = value;
const hexColor = canvasContext.fillStyle;
canvasContext.fillStyle = defaultHexColor;
return hexColor !== defaultHexColor || value === "black" ? hexColor : null;
};
|
https://github.com/excalidraw/excalidraw/commit/fa8354e306f43d7b76d750b96b8e9de5fab21c8b
|
src/components/ColorPicker.tsx
|
keep keep add keep keep keep keep keep
|
<mask> const value = event.target.value.toLowerCase();
<mask> if (value.match(colorRegex)) {
<mask> onChange(value === "transparent" ? "transparent" : `#${value}`);
<mask> }
<mask> setInnerValue(value);
<mask> }}
<mask> value={(innerValue || "").replace(/^#/, "")}
<mask> onPaste={(event) => onChange(event.clipboardData.getData("text"))}
</s> Support different color inputs (#1478) (#1479) </s> add const standardizeColor = (
value: string,
canvasContext: CanvasRenderingContext2D,
): string | null => {
const defaultHexColor = "#000000";
canvasContext.fillStyle = value;
const hexColor = canvasContext.fillStyle;
canvasContext.fillStyle = defaultHexColor;
return hexColor !== defaultHexColor || value === "black" ? hexColor : null;
};
</s> add const canvasContext = React.useRef<CanvasRenderingContext2D>(
document.createElement("canvas").getContext("2d"),
);
|
https://github.com/excalidraw/excalidraw/commit/fa8354e306f43d7b76d750b96b8e9de5fab21c8b
|
src/components/ColorPicker.tsx
|
keep replace replace replace keep keep replace keep keep keep keep
|
<mask> "@testing-library/react": {
<mask> "version": "9.4.0",
<mask> "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-9.4.0.tgz",
<mask> "integrity": "sha512-XdhDWkI4GktUPsz0AYyeQ8M9qS/JFie06kcSnUVcpgOwFjAu9vhwR83qBl+lw9yZWkbECjL8Hd+n5hH6C0oWqg==",
<mask> "dev": true,
<mask> "requires": {
<mask> "@babel/runtime": "^7.7.6",
<mask> "@testing-library/dom": "^6.11.0",
<mask> "@types/testing-library__react": "^9.1.2"
<mask> }
<mask> },
</s> Bump @testing-library/react from 9.4.0 to 9.4.1 (#824)
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 9.4.0 to 9.4.1.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v9.4.0...v9.4.1)
Signed-off-by: dependabot-preview[bot] <[email protected]> </s> remove "version": "6.12.0",
"resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.12.0.tgz",
"integrity": "sha512-PQ/gzABzc53T68RldZ/sJHKCihtP9ofU8XIgOk+H7tlfoCRdg9mqICio5Fo8j3Z8wo+pOfuDsuPprWsn3YtVmA==",
</s> add "version": "6.12.1",
"resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.12.1.tgz",
"integrity": "sha512-cgqnEjxKk31tQt29j4baSWaZPNjQf3bHalj2gcHQTpW5SuHRal76gOpF0vypeEo6o+sS5inOvvNdzLY0B3FB2A==", </s> remove "version": "3.0.1",
"resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-3.0.1.tgz",
"integrity": "sha512-3Ha7lu+zshEG/CeHdcpmQsZnnZpPj/UsG3DuKO8FskjuDbkx3jE3845H+CuwZjA2YWYDfKMU2KhnCaXMLd3wVw==",
</s> add "version": "3.0.2",
"resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-3.0.2.tgz",
"integrity": "sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==", </s> remove "@testing-library/react": "9.4.0",
</s> add "@testing-library/react": "9.4.1",
|
https://github.com/excalidraw/excalidraw/commit/fbab93baff43f52c3bc650e4930ba4f5f87a1797
|
package-lock.json
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
<mask> "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="
<mask> },
<mask> "@types/testing-library__dom": {
<mask> "version": "6.12.0",
<mask> "resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.12.0.tgz",
<mask> "integrity": "sha512-PQ/gzABzc53T68RldZ/sJHKCihtP9ofU8XIgOk+H7tlfoCRdg9mqICio5Fo8j3Z8wo+pOfuDsuPprWsn3YtVmA==",
<mask> "dev": true,
<mask> "requires": {
<mask> "pretty-format": "^24.3.0"
<mask> }
<mask> },
</s> Bump @testing-library/react from 9.4.0 to 9.4.1 (#824)
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 9.4.0 to 9.4.1.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v9.4.0...v9.4.1)
Signed-off-by: dependabot-preview[bot] <[email protected]> </s> remove "version": "9.4.0",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-9.4.0.tgz",
"integrity": "sha512-XdhDWkI4GktUPsz0AYyeQ8M9qS/JFie06kcSnUVcpgOwFjAu9vhwR83qBl+lw9yZWkbECjL8Hd+n5hH6C0oWqg==",
</s> add "version": "9.4.1",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-9.4.1.tgz",
"integrity": "sha512-sta3ui24HPgW92quHyQj6gpOkNgLNx8BX/QOU4k1bddo43ZdqlGwmzCYwL93bExfhergwiau+IzBGl7TCsSFeA==", </s> remove "version": "3.0.1",
"resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-3.0.1.tgz",
"integrity": "sha512-3Ha7lu+zshEG/CeHdcpmQsZnnZpPj/UsG3DuKO8FskjuDbkx3jE3845H+CuwZjA2YWYDfKMU2KhnCaXMLd3wVw==",
</s> add "version": "3.0.2",
"resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-3.0.2.tgz",
"integrity": "sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==", </s> remove "@babel/runtime": "^7.7.6",
</s> add "@babel/runtime": "^7.8.3", </s> remove "@testing-library/react": "9.4.0",
</s> add "@testing-library/react": "9.4.1",
|
https://github.com/excalidraw/excalidraw/commit/fbab93baff43f52c3bc650e4930ba4f5f87a1797
|
package-lock.json
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> "xml-name-validator": "^3.0.0"
<mask> }
<mask> },
<mask> "wait-for-expect": {
<mask> "version": "3.0.1",
<mask> "resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-3.0.1.tgz",
<mask> "integrity": "sha512-3Ha7lu+zshEG/CeHdcpmQsZnnZpPj/UsG3DuKO8FskjuDbkx3jE3845H+CuwZjA2YWYDfKMU2KhnCaXMLd3wVw==",
<mask> "dev": true
<mask> },
<mask> "walker": {
<mask> "version": "1.0.7",
<mask> "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
</s> Bump @testing-library/react from 9.4.0 to 9.4.1 (#824)
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 9.4.0 to 9.4.1.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v9.4.0...v9.4.1)
Signed-off-by: dependabot-preview[bot] <[email protected]> </s> remove "version": "6.12.0",
"resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.12.0.tgz",
"integrity": "sha512-PQ/gzABzc53T68RldZ/sJHKCihtP9ofU8XIgOk+H7tlfoCRdg9mqICio5Fo8j3Z8wo+pOfuDsuPprWsn3YtVmA==",
</s> add "version": "6.12.1",
"resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.12.1.tgz",
"integrity": "sha512-cgqnEjxKk31tQt29j4baSWaZPNjQf3bHalj2gcHQTpW5SuHRal76gOpF0vypeEo6o+sS5inOvvNdzLY0B3FB2A==", </s> remove "version": "9.4.0",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-9.4.0.tgz",
"integrity": "sha512-XdhDWkI4GktUPsz0AYyeQ8M9qS/JFie06kcSnUVcpgOwFjAu9vhwR83qBl+lw9yZWkbECjL8Hd+n5hH6C0oWqg==",
</s> add "version": "9.4.1",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-9.4.1.tgz",
"integrity": "sha512-sta3ui24HPgW92quHyQj6gpOkNgLNx8BX/QOU4k1bddo43ZdqlGwmzCYwL93bExfhergwiau+IzBGl7TCsSFeA==", </s> remove "@babel/runtime": "^7.7.6",
</s> add "@babel/runtime": "^7.8.3", </s> remove "@testing-library/react": "9.4.0",
</s> add "@testing-library/react": "9.4.1",
|
https://github.com/excalidraw/excalidraw/commit/fbab93baff43f52c3bc650e4930ba4f5f87a1797
|
package-lock.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> },
<mask> "description": "",
<mask> "devDependencies": {
<mask> "@testing-library/jest-dom": "5.1.1",
<mask> "@testing-library/react": "9.4.0",
<mask> "@types/jest": "25.1.3",
<mask> "@types/nanoid": "2.1.0",
<mask> "@types/react": "16.9.22",
<mask> "@types/react-dom": "16.9.5",
<mask> "eslint": "6.8.0",
</s> Bump @testing-library/react from 9.4.0 to 9.4.1 (#824)
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 9.4.0 to 9.4.1.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v9.4.0...v9.4.1)
Signed-off-by: dependabot-preview[bot] <[email protected]> </s> remove "version": "9.4.0",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-9.4.0.tgz",
"integrity": "sha512-XdhDWkI4GktUPsz0AYyeQ8M9qS/JFie06kcSnUVcpgOwFjAu9vhwR83qBl+lw9yZWkbECjL8Hd+n5hH6C0oWqg==",
</s> add "version": "9.4.1",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-9.4.1.tgz",
"integrity": "sha512-sta3ui24HPgW92quHyQj6gpOkNgLNx8BX/QOU4k1bddo43ZdqlGwmzCYwL93bExfhergwiau+IzBGl7TCsSFeA==", </s> remove "version": "3.0.1",
"resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-3.0.1.tgz",
"integrity": "sha512-3Ha7lu+zshEG/CeHdcpmQsZnnZpPj/UsG3DuKO8FskjuDbkx3jE3845H+CuwZjA2YWYDfKMU2KhnCaXMLd3wVw==",
</s> add "version": "3.0.2",
"resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-3.0.2.tgz",
"integrity": "sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag==", </s> remove "version": "6.12.0",
"resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.12.0.tgz",
"integrity": "sha512-PQ/gzABzc53T68RldZ/sJHKCihtP9ofU8XIgOk+H7tlfoCRdg9mqICio5Fo8j3Z8wo+pOfuDsuPprWsn3YtVmA==",
</s> add "version": "6.12.1",
"resolved": "https://registry.npmjs.org/@types/testing-library__dom/-/testing-library__dom-6.12.1.tgz",
"integrity": "sha512-cgqnEjxKk31tQt29j4baSWaZPNjQf3bHalj2gcHQTpW5SuHRal76gOpF0vypeEo6o+sS5inOvvNdzLY0B3FB2A==", </s> remove "@babel/runtime": "^7.7.6",
</s> add "@babel/runtime": "^7.8.3",
|
https://github.com/excalidraw/excalidraw/commit/fbab93baff43f52c3bc650e4930ba4f5f87a1797
|
package.json
|
keep keep keep add keep keep keep keep keep keep
|
<mask> Spreadsheet,
<mask> VALID_SPREADSHEET,
<mask> MALFORMED_SPREADSHEET,
<mask> } from "./charts";
<mask>
<mask> const TYPE_ELEMENTS = "excalidraw/elements";
<mask>
<mask> type ElementsClipboard = {
<mask> type: typeof TYPE_ELEMENTS;
<mask> created: number;
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> add import { canvasToBlob } from "../data/blob";
import { CanvasError } from "../errors"; </s> add import { canvasToBlob } from "./blob"; </s> add import { CanvasError } from "../errors"; </s> add export const ErrorCanvasPreview = () => {
return (
<div>
<h3>{t("canvasError.cannotShowPreview")}</h3>
<p>
<span>{t("canvasError.canvasTooBig")}</span>
</p>
<em>({t("canvasError.canvasTooBigTip")})</em>
</div>
);
};
</s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> remove private copyToClipboardAsSvg = () => {
</s> add private copyToClipboardAsSvg = async () => {
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/clipboard.ts
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> : { text: systemClipboard };
<mask> }
<mask> };
<mask>
<mask> export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
<mask> new Promise((resolve, reject) => {
<mask> try {
<mask> canvas.toBlob(async (blob) => {
<mask> try {
<mask> await navigator.clipboard.write([
<mask> new window.ClipboardItem({ "image/png": blob }),
<mask> ]);
<mask> resolve();
<mask> } catch (error) {
<mask> reject(error);
<mask> }
<mask> });
<mask> } catch (error) {
<mask> reject(error);
<mask> }
<mask> });
<mask>
<mask> export const copyTextToSystemClipboard = async (text: string | null) => {
<mask> let copied = false;
<mask> if (probablySupportsClipboardWriteText) {
<mask> try {
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove tempCanvas.toBlob(async (blob) => {
if (blob) {
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
});
}
</s> add let blob = await canvasToBlob(tempCanvas);
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"], </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> remove copyCanvasToClipboardAsPng(tempCanvas);
} catch {
window.alert(t("alerts.couldNotCopyToClipboard"));
</s> add await copyCanvasToClipboardAsPng(tempCanvas);
} catch (error) {
if (error.name === "CANVAS_POSSIBLY_TOO_BIG") {
throw error;
}
throw new Error(t("alerts.couldNotCopyToClipboard")); </s> add import { CanvasError } from "../errors"; </s> remove private copyToClipboardAsSvg = () => {
</s> add private copyToClipboardAsSvg = async () => { </s> remove console.error(error);
setAppState({ errorMessage: error.message });
</s> add if (error.name !== "AbortError") {
const { width, height } = canvas;
console.error(error, { width, height });
setAppState({ errorMessage: error.message });
}
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/clipboard.ts
|
keep replace keep keep keep keep replace
|
<mask>
<mask> private copyToClipboardAsPng = () => {
<mask> const elements = this.scene.getElements();
<mask>
<mask> const selectedElements = getSelectedElements(elements, this.state);
<mask> try {
<mask> exportCanvas(
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove private copyToClipboardAsSvg = () => {
</s> add private copyToClipboardAsSvg = async () => { </s> add import { canvasToBlob } from "../data/blob";
import { CanvasError } from "../errors"; </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> add export const ErrorCanvasPreview = () => {
return (
<div>
<h3>{t("canvasError.cannotShowPreview")}</h3>
<p>
<span>{t("canvasError.canvasTooBig")}</span>
</p>
<em>({t("canvasError.canvasTooBigTip")})</em>
</div>
);
};
</s> add const [previewError, setPreviewError] = useState<Error | null>(null);
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> this.setState({ errorMessage: error.message });
<mask> }
<mask> };
<mask>
<mask> private copyToClipboardAsSvg = () => {
<mask> const selectedElements = getSelectedElements(
<mask> this.scene.getElements(),
<mask> this.state,
<mask> );
<mask> try {
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove private copyToClipboardAsPng = () => {
</s> add private copyToClipboardAsPng = async () => { </s> remove exportCanvas(
</s> add await exportCanvas( </s> remove console.error(error);
setAppState({ errorMessage: error.message });
</s> add if (error.name !== "AbortError") {
const { width, height } = canvas;
console.error(error, { width, height });
setAppState({ errorMessage: error.message });
} </s> remove exportCanvas(
</s> add await exportCanvas( </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> remove } catch (error) {
console.error(error);
setAppState({ errorMessage: error.message });
}
</s> add
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/App.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> this.scene.getElements(),
<mask> this.state,
<mask> );
<mask> try {
<mask> exportCanvas(
<mask> "clipboard-svg",
<mask> selectedElements.length ? selectedElements : this.scene.getElements(),
<mask> this.state,
<mask> this.canvas!,
<mask> this.state,
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove exportCanvas(
</s> add await exportCanvas( </s> remove private copyToClipboardAsSvg = () => {
</s> add private copyToClipboardAsSvg = async () => { </s> add export const ErrorCanvasPreview = () => {
return (
<div>
<h3>{t("canvasError.cannotShowPreview")}</h3>
<p>
<span>{t("canvasError.canvasTooBig")}</span>
</p>
<em>({t("canvasError.canvasTooBigTip")})</em>
</div>
);
};
</s> remove private copyToClipboardAsPng = () => {
</s> add private copyToClipboardAsPng = async () => { </s> add import { canvasToBlob } from "../data/blob";
import { CanvasError } from "../errors"; </s> remove console.error(error);
setAppState({ errorMessage: error.message });
</s> add if (error.name !== "AbortError") {
const { width, height } = canvas;
console.error(error, { width, height });
setAppState({ errorMessage: error.message });
}
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/App.tsx
|
keep keep add keep keep keep keep keep
|
<mask> import { getSelectedElements, isSomeElementSelected } from "../scene";
<mask> import useIsMobile from "../is-mobile";
<mask> import { Dialog } from "./Dialog";
<mask>
<mask> const scales = [1, 2, 3];
<mask> const defaultScale = scales.includes(devicePixelRatio) ? devicePixelRatio : 1;
<mask>
<mask> export const ErrorCanvasPreview = () => {
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> add import { CanvasError } from "../errors"; </s> add import { canvasToBlob } from "./blob"; </s> add export const ErrorCanvasPreview = () => {
return (
<div>
<h3>{t("canvasError.cannotShowPreview")}</h3>
<p>
<span>{t("canvasError.canvasTooBig")}</span>
</p>
<em>({t("canvasError.canvasTooBigTip")})</em>
</div>
);
};
</s> add import { canvasToBlob } from "./data/blob"; </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> remove private copyToClipboardAsSvg = () => {
</s> add private copyToClipboardAsSvg = async () => {
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/ExportDialog.tsx
|
keep add keep keep keep keep
|
<mask> const defaultScale = scales.includes(devicePixelRatio) ? devicePixelRatio : 1;
<mask>
<mask> export type ExportCB = (
<mask> elements: readonly NonDeletedExcalidrawElement[],
<mask> scale?: number,
<mask> ) => void;
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> add import { canvasToBlob } from "../data/blob";
import { CanvasError } from "../errors"; </s> remove exportCanvas(
</s> add await exportCanvas( </s> add import { canvasToBlob } from "./data/blob"; </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> add const [previewError, setPreviewError] = useState<Error | null>(null); </s> remove tempCanvas.toBlob(async (blob) => {
if (blob) {
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
});
}
</s> add let blob = await canvasToBlob(tempCanvas);
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/ExportDialog.tsx
|
keep add keep keep keep keep keep
|
<mask> const [scale, setScale] = useState(defaultScale);
<mask> const [exportSelected, setExportSelected] = useState(someElementIsSelected);
<mask> const previewRef = useRef<HTMLDivElement>(null);
<mask> const {
<mask> exportBackground,
<mask> viewBackgroundColor,
<mask> shouldAddWatermark,
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> remove private copyToClipboardAsPng = () => {
</s> add private copyToClipboardAsPng = async () => { </s> add import { canvasToBlob } from "../data/blob";
import { CanvasError } from "../errors"; </s> remove exportCanvas(
</s> add await exportCanvas( </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> add export const ErrorCanvasPreview = () => {
return (
<div>
<h3>{t("canvasError.cannotShowPreview")}</h3>
<p>
<span>{t("canvasError.canvasTooBig")}</span>
</p>
<em>({t("canvasError.canvasTooBigTip")})</em>
</div>
);
};
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/ExportDialog.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> }, [someElementIsSelected]);
<mask>
<mask> useEffect(() => {
<mask> const previewNode = previewRef.current;
<mask> const canvas = exportToCanvas(exportedElements, appState, {
<mask> exportBackground,
<mask> viewBackgroundColor,
<mask> exportPadding,
<mask> scale,
<mask> shouldAddWatermark,
<mask> });
<mask> previewNode?.appendChild(canvas);
<mask> return () => {
<mask> previewNode?.removeChild(canvas);
<mask> };
<mask> }, [
<mask> appState,
<mask> exportedElements,
<mask> exportBackground,
<mask> exportPadding,
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> add const [previewError, setPreviewError] = useState<Error | null>(null); </s> remove try {
await exportCanvas(type, exportedElements, appState, canvas, {
exportBackground: appState.exportBackground,
name: appState.name,
viewBackgroundColor: appState.viewBackgroundColor,
scale,
shouldAddWatermark: appState.shouldAddWatermark,
</s> add await exportCanvas(type, exportedElements, appState, canvas, {
exportBackground: appState.exportBackground,
name: appState.name,
viewBackgroundColor: appState.viewBackgroundColor,
scale,
shouldAddWatermark: appState.shouldAddWatermark,
})
.catch(muteFSAbortError)
.catch((error) => {
console.error(error);
setAppState({ errorMessage: error.message }); </s> remove private copyToClipboardAsPng = () => {
</s> add private copyToClipboardAsPng = async () => { </s> remove private copyToClipboardAsSvg = () => {
</s> add private copyToClipboardAsSvg = async () => { </s> remove console.error(error);
setAppState({ errorMessage: error.message });
</s> add if (error.name !== "AbortError") {
const { width, height } = canvas;
console.error(error, { width, height });
setAppState({ errorMessage: error.message });
} </s> add export const ErrorCanvasPreview = () => {
return (
<div>
<h3>{t("canvasError.cannotShowPreview")}</h3>
<p>
<span>{t("canvasError.canvasTooBig")}</span>
</p>
<em>({t("canvasError.canvasTooBigTip")})</em>
</div>
);
};
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/ExportDialog.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ]);
<mask>
<mask> return (
<mask> <div className="ExportDialog">
<mask> <div className="ExportDialog__preview" ref={previewRef}></div>
<mask> <Stack.Col gap={2} align="center">
<mask> <div className="ExportDialog__actions">
<mask> <Stack.Row gap={2}>
<mask> <ToolButton
<mask> type="button"
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove <div className="ErrorSplash">
</s> add <div className="ErrorSplash excalidraw"> </s> remove } catch (error) {
console.error(error);
setAppState({ errorMessage: error.message });
}
</s> add </s> add export const ErrorCanvasPreview = () => {
return (
<div>
<h3>{t("canvasError.cannotShowPreview")}</h3>
<p>
<span>{t("canvasError.canvasTooBig")}</span>
</p>
<em>({t("canvasError.canvasTooBigTip")})</em>
</div>
);
};
</s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> remove tempCanvas.toBlob(async (blob) => {
if (blob) {
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
});
}
</s> add let blob = await canvasToBlob(tempCanvas);
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"], </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
}
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/ExportDialog.tsx
|
keep keep keep keep replace replace replace replace replace replace replace keep replace replace replace replace keep keep
|
<mask> exportedElements,
<mask> scale,
<mask> ) => {
<mask> if (canvas) {
<mask> try {
<mask> await exportCanvas(type, exportedElements, appState, canvas, {
<mask> exportBackground: appState.exportBackground,
<mask> name: appState.name,
<mask> viewBackgroundColor: appState.viewBackgroundColor,
<mask> scale,
<mask> shouldAddWatermark: appState.shouldAddWatermark,
<mask> });
<mask> } catch (error) {
<mask> console.error(error);
<mask> setAppState({ errorMessage: error.message });
<mask> }
<mask> }
<mask> };
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove console.error(error);
setAppState({ errorMessage: error.message });
</s> add if (error.name !== "AbortError") {
const { width, height } = canvas;
console.error(error, { width, height });
setAppState({ errorMessage: error.message });
} </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> remove copyCanvasToClipboardAsPng(tempCanvas);
} catch {
window.alert(t("alerts.couldNotCopyToClipboard"));
</s> add await copyCanvasToClipboardAsPng(tempCanvas);
} catch (error) {
if (error.name === "CANVAS_POSSIBLY_TOO_BIG") {
throw error;
}
throw new Error(t("alerts.couldNotCopyToClipboard")); </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> remove tempCanvas.toBlob(async (blob) => {
if (blob) {
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
});
}
</s> add let blob = await canvasToBlob(tempCanvas);
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/LayerUI.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> canvas,
<mask> appState,
<mask> );
<mask> } catch (error) {
<mask> console.error(error);
<mask> setAppState({ errorMessage: error.message });
<mask> }
<mask> }
<mask> }}
<mask> />
<mask> );
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove try {
await exportCanvas(type, exportedElements, appState, canvas, {
exportBackground: appState.exportBackground,
name: appState.name,
viewBackgroundColor: appState.viewBackgroundColor,
scale,
shouldAddWatermark: appState.shouldAddWatermark,
</s> add await exportCanvas(type, exportedElements, appState, canvas, {
exportBackground: appState.exportBackground,
name: appState.name,
viewBackgroundColor: appState.viewBackgroundColor,
scale,
shouldAddWatermark: appState.shouldAddWatermark,
})
.catch(muteFSAbortError)
.catch((error) => {
console.error(error);
setAppState({ errorMessage: error.message }); </s> remove } catch (error) {
console.error(error);
setAppState({ errorMessage: error.message });
}
</s> add </s> remove private copyToClipboardAsSvg = () => {
</s> add private copyToClipboardAsSvg = async () => { </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> remove copyCanvasToClipboardAsPng(tempCanvas);
} catch {
window.alert(t("alerts.couldNotCopyToClipboard"));
</s> add await copyCanvasToClipboardAsPng(tempCanvas);
} catch (error) {
if (error.name === "CANVAS_POSSIBLY_TOO_BIG") {
throw error;
}
throw new Error(t("alerts.couldNotCopyToClipboard")); </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
};
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/LayerUI.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> private errorSplash() {
<mask> return (
<mask> <div className="ErrorSplash">
<mask> <div className="ErrorSplash-messageContainer">
<mask> <div className="ErrorSplash-paragraph bigger align-center">
<mask> {t("errorSplash.headingMain_pre")}
<mask> <button onClick={() => window.location.reload()}>
<mask> {t("errorSplash.headingMain_button")}
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove <div className="ExportDialog__preview" ref={previewRef}></div>
</s> add <div className="ExportDialog__preview" ref={previewRef}>
{previewError && <ErrorCanvasPreview />}
</div> </s> remove } catch (error) {
console.error(error);
setAppState({ errorMessage: error.message });
}
</s> add </s> remove private copyToClipboardAsSvg = () => {
</s> add private copyToClipboardAsSvg = async () => { </s> remove private copyToClipboardAsPng = () => {
</s> add private copyToClipboardAsPng = async () => { </s> add export const ErrorCanvasPreview = () => {
return (
<div>
<h3>{t("canvasError.cannotShowPreview")}</h3>
<p>
<span>{t("canvasError.canvasTooBig")}</span>
</p>
<em>({t("canvasError.canvasTooBigTip")})</em>
</div>
);
};
</s> remove tempCanvas.toBlob(async (blob) => {
if (blob) {
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
});
}
</s> add let blob = await canvasToBlob(tempCanvas);
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/components/TopErrorBoundary.tsx
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> overflow-y: auto;
<mask> max-height: calc(100vh - 236px);
<mask> }
<mask>
<mask> .ErrorSplash {
<mask> min-height: 100vh;
<mask> padding: 20px 0;
<mask> overflow: auto;
<mask> display: flex;
<mask> align-items: center;
<mask> justify-content: center;
<mask> user-select: text;
<mask>
<mask> .ErrorSplash-messageContainer {
<mask> display: flex;
<mask> flex-direction: column;
<mask> align-items: center;
<mask> justify-content: center;
<mask>
<mask> padding: 40px;
<mask> background-color: $oc-red-1;
<mask> border: 3px solid $oc-red-9;
<mask> }
<mask>
<mask> .ErrorSplash-paragraph {
<mask> margin: 15px 0;
<mask> max-width: 600px;
<mask>
<mask> &.align-center {
<mask> text-align: center;
<mask> }
<mask> }
<mask>
<mask> .bigger,
<mask> .bigger button {
<mask> font-size: 1.1em;
<mask> }
<mask>
<mask> .smaller,
<mask> .smaller button {
<mask> font-size: 0.9em;
<mask> }
<mask>
<mask> .ErrorSplash-details {
<mask> display: flex;
<mask> flex-direction: column;
<mask> align-items: flex-start;
<mask>
<mask> textarea {
<mask> width: 100%;
<mask> margin: 10px 0;
<mask> font-family: "Cascadia";
<mask> font-size: 0.8em;
<mask> }
<mask> }
<mask> }
<mask>
<mask> .dropdown-select {
<mask> height: 1.5rem;
<mask> padding: 0;
<mask> padding-inline-start: 0.5rem;
<mask> padding-inline-end: 1.5rem;
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove copyCanvasToClipboardAsPng(tempCanvas);
} catch {
window.alert(t("alerts.couldNotCopyToClipboard"));
</s> add await copyCanvasToClipboardAsPng(tempCanvas);
} catch (error) {
if (error.name === "CANVAS_POSSIBLY_TOO_BIG") {
throw error;
}
throw new Error(t("alerts.couldNotCopyToClipboard")); </s> add import { canvasToBlob } from "./blob"; </s> add import { CanvasError } from "../errors"; </s> remove console.error(error);
setAppState({ errorMessage: error.message });
</s> add if (error.name !== "AbortError") {
const { width, height } = canvas;
console.error(error, { width, height });
setAppState({ errorMessage: error.message });
} </s> add import { canvasToBlob } from "../data/blob";
import { CanvasError } from "../errors"; </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
};
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/css/styles.scss
|
keep keep keep add keep keep keep keep
|
<mask> import { AppState } from "../types";
<mask> import { LibraryData, ImportedDataState } from "./types";
<mask> import { calculateScrollCenter } from "../scene";
<mask> import { MIME_TYPES } from "../constants";
<mask>
<mask> export const parseFileContents = async (blob: Blob | File) => {
<mask> let contents: string;
<mask>
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> add import { canvasToBlob } from "./blob"; </s> add import { canvasToBlob } from "../data/blob";
import { CanvasError } from "../errors"; </s> add import { canvasToBlob } from "./data/blob"; </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> remove tempCanvas.toBlob(async (blob) => {
if (blob) {
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
});
}
</s> add let blob = await canvasToBlob(tempCanvas);
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/data/blob.ts
|
keep add keep keep keep keep keep keep
|
<mask> import { restore } from "./restore";
<mask> import { ImportedDataState } from "./types";
<mask>
<mask> export { loadFromBlob } from "./blob";
<mask> export { saveAsJSON, loadFromJSON } from "./json";
<mask>
<mask> const BACKEND_GET = process.env.REACT_APP_BACKEND_V1_GET_URL;
<mask>
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> add import { CanvasError } from "../errors"; </s> add import { canvasToBlob } from "../data/blob";
import { CanvasError } from "../errors"; </s> add import { canvasToBlob } from "./data/blob"; </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> remove console.error(error);
setAppState({ errorMessage: error.message });
</s> add if (error.name !== "AbortError") {
const { width, height } = canvas;
console.error(error, { width, height });
setAppState({ errorMessage: error.message });
}
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/data/index.ts
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep replace replace replace keep keep keep
|
<mask> document.body.appendChild(tempCanvas);
<mask>
<mask> if (type === "png") {
<mask> const fileName = `${name}.png`;
<mask> tempCanvas.toBlob(async (blob) => {
<mask> if (blob) {
<mask> if (appState.exportEmbedScene) {
<mask> blob = await (
<mask> await import(/* webpackChunkName: "image" */ "./image")
<mask> ).encodePngMetadata({
<mask> blob,
<mask> metadata: serializeAsJSON(elements, appState),
<mask> });
<mask> }
<mask>
<mask> await fileSave(blob, {
<mask> fileName: fileName,
<mask> extensions: [".png"],
<mask> });
<mask> }
<mask> });
<mask> } else if (type === "clipboard") {
<mask> try {
<mask> copyCanvasToClipboardAsPng(tempCanvas);
<mask> } catch {
<mask> window.alert(t("alerts.couldNotCopyToClipboard"));
<mask> }
<mask> } else if (type === "backend") {
<mask> exportToBackend(elements, {
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> remove console.error(error);
setAppState({ errorMessage: error.message });
</s> add if (error.name !== "AbortError") {
const { width, height } = canvas;
console.error(error, { width, height });
setAppState({ errorMessage: error.message });
} </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> remove try {
await exportCanvas(type, exportedElements, appState, canvas, {
exportBackground: appState.exportBackground,
name: appState.name,
viewBackgroundColor: appState.viewBackgroundColor,
scale,
shouldAddWatermark: appState.shouldAddWatermark,
</s> add await exportCanvas(type, exportedElements, appState, canvas, {
exportBackground: appState.exportBackground,
name: appState.name,
viewBackgroundColor: appState.viewBackgroundColor,
scale,
shouldAddWatermark: appState.shouldAddWatermark,
})
.catch(muteFSAbortError)
.catch((error) => {
console.error(error);
setAppState({ errorMessage: error.message }); </s> add import { canvasToBlob } from "./blob";
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/data/index.ts
|
keep keep keep add keep keep keep keep keep keep
|
<mask> "lineEditor_info": "Double-click or press Enter to edit points",
<mask> "lineEditor_pointSelected": "Press Delete to remove point, CtrlOrCmd+D to duplicate, or drag to move",
<mask> "lineEditor_nothingSelected": "Select a point to move or remove, or hold Alt and click to add new points"
<mask> },
<mask> "errorSplash": {
<mask> "headingMain_pre": "Encountered an error. Try ",
<mask> "headingMain_button": "reloading the page.",
<mask> "clearCanvasMessage": "If reloading doesn't work, try ",
<mask> "clearCanvasMessage_button": "clearing the canvas.",
<mask> "clearCanvasCaveat": " This will result in loss of work ",
</s> Show error message when canvas to export is too big (#1256) (#2210)
Co-authored-by: dwelle <[email protected]> </s> remove const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
previewNode?.appendChild(canvas);
return () => {
previewNode?.removeChild(canvas);
};
</s> add if (!previewNode) {
return;
}
try {
const canvas = exportToCanvas(exportedElements, appState, {
exportBackground,
viewBackgroundColor,
exportPadding,
scale,
shouldAddWatermark,
});
let isRemoved = false;
// if converting to blob fails, there's some problem that will
// likely prevent preview and export (e.g. canvas too big)
canvasToBlob(canvas)
.then(() => {
if (isRemoved) {
return;
}
setPreviewError(null);
previewNode.appendChild(canvas);
})
.catch((error) => {
console.error(error);
setPreviewError(new CanvasError());
});
return () => {
isRemoved = true;
canvas.remove();
};
} catch (error) {
console.error(error);
setPreviewError(new CanvasError());
} </s> remove export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) =>
new Promise((resolve, reject) => {
try {
canvas.toBlob(async (blob) => {
try {
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
resolve();
} catch (error) {
reject(error);
}
});
} catch (error) {
reject(error);
}
});
</s> add export const copyCanvasToClipboardAsPng = async (canvas: HTMLCanvasElement) => {
const blob = await canvasToBlob(canvas);
await navigator.clipboard.write([
new window.ClipboardItem({ "image/png": blob }),
]);
}; </s> remove copyCanvasToClipboardAsPng(tempCanvas);
} catch {
window.alert(t("alerts.couldNotCopyToClipboard"));
</s> add await copyCanvasToClipboardAsPng(tempCanvas);
} catch (error) {
if (error.name === "CANVAS_POSSIBLY_TOO_BIG") {
throw error;
}
throw new Error(t("alerts.couldNotCopyToClipboard")); </s> remove try {
await exportCanvas(type, exportedElements, appState, canvas, {
exportBackground: appState.exportBackground,
name: appState.name,
viewBackgroundColor: appState.viewBackgroundColor,
scale,
shouldAddWatermark: appState.shouldAddWatermark,
</s> add await exportCanvas(type, exportedElements, appState, canvas, {
exportBackground: appState.exportBackground,
name: appState.name,
viewBackgroundColor: appState.viewBackgroundColor,
scale,
shouldAddWatermark: appState.shouldAddWatermark,
})
.catch(muteFSAbortError)
.catch((error) => {
console.error(error);
setAppState({ errorMessage: error.message }); </s> remove private copyToClipboardAsPng = () => {
</s> add private copyToClipboardAsPng = async () => { </s> remove tempCanvas.toBlob(async (blob) => {
if (blob) {
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
});
}
</s> add let blob = await canvasToBlob(tempCanvas);
if (appState.exportEmbedScene) {
blob = await (
await import(/* webpackChunkName: "image" */ "./image")
).encodePngMetadata({
blob,
metadata: serializeAsJSON(elements, appState),
});
}
await fileSave(blob, {
fileName: fileName,
extensions: [".png"],
|
https://github.com/excalidraw/excalidraw/commit/fc58e51ab3882b52bad628b51c641958a1d2421f
|
src/locales/en.json
|
keep add keep keep
|
<mask> z-index: 10;
<mask> padding: 5px 0 5px;
<mask> }
<mask> }
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1].focus();
</s> add if (activeElement === container) {
if (event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus();
} else {
focusableElements[0].focus();
}
event.preventDefault();
event.stopImmediatePropagation();
} else if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus(); </s> remove focusableElements[0].focus();
</s> add focusableElements[0]?.focus(); </s> remove element.style.height = `${viewportHeight - 20}px`;
element.style.top = "10px";
element.style.overflowY = "scroll";
}
if (width >= viewportWidth) {
element.style.width = `${viewportWidth}px`;
element.style.left = "0px";
element.style.overflowX = "scroll";
</s> add container.style.height = `${viewportHeight - 20}px`;
container.style.top = "10px";
container.style.overflowY = "scroll";
} else if (top + height - offsetTop > viewportHeight) {
container.style.top = `${viewportHeight - height}px`;
} else {
container.style.top = `${top}px`; </s> add container.focus();
</s> remove //Resize to fit viewport on smaller screens
</s> add </s> remove }, [fitInViewport, viewportWidth, viewportHeight, offsetLeft, offsetTop]);
</s> add }, [
top,
left,
fitInViewport,
viewportWidth,
viewportHeight,
offsetLeft,
offsetTop,
]);
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.scss
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> viewportHeight = window.innerHeight,
<mask> }: Props) => {
<mask> const popoverRef = useRef<HTMLDivElement>(null);
<mask>
<mask> const container = popoverRef.current;
<mask>
<mask> useEffect(() => {
<mask> if (!container) {
<mask> return;
<mask> }
<mask>
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> add const container = popoverRef.current;
</s> add container.focus();
</s> remove if (fitInViewport && popoverRef.current) {
const element = popoverRef.current;
const { x, y, width, height } = element.getBoundingClientRect();
</s> add if (fitInViewport && popoverRef.current && top != null && left != null) {
const container = popoverRef.current;
const { width, height } = container.getBoundingClientRect(); </s> remove }, [fitInViewport, viewportWidth, viewportHeight, offsetLeft, offsetTop]);
</s> add }, [
top,
left,
fitInViewport,
viewportWidth,
viewportHeight,
offsetLeft,
offsetTop,
]); </s> remove }, [container]);
</s> add }, []);
const lastInitializedPosRef = useRef<{ top: number; left: number } | null>(
null,
); </s> remove element.style.height = `${viewportHeight - 20}px`;
element.style.top = "10px";
element.style.overflowY = "scroll";
}
if (width >= viewportWidth) {
element.style.width = `${viewportWidth}px`;
element.style.left = "0px";
element.style.overflowX = "scroll";
</s> add container.style.height = `${viewportHeight - 20}px`;
container.style.top = "10px";
container.style.overflowY = "scroll";
} else if (top + height - offsetTop > viewportHeight) {
container.style.top = `${viewportHeight - height}px`;
} else {
container.style.top = `${top}px`;
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep add keep keep keep keep keep keep
|
<mask>
<mask> useEffect(() => {
<mask> if (!container) {
<mask> return;
<mask> }
<mask>
<mask> container.focus();
<mask>
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove const container = popoverRef.current;
</s> add </s> add container.focus();
</s> remove }, [fitInViewport, viewportWidth, viewportHeight, offsetLeft, offsetTop]);
</s> add }, [
top,
left,
fitInViewport,
viewportWidth,
viewportHeight,
offsetLeft,
offsetTop,
]); </s> remove element.style.height = `${viewportHeight - 20}px`;
element.style.top = "10px";
element.style.overflowY = "scroll";
}
if (width >= viewportWidth) {
element.style.width = `${viewportWidth}px`;
element.style.left = "0px";
element.style.overflowX = "scroll";
</s> add container.style.height = `${viewportHeight - 20}px`;
container.style.top = "10px";
container.style.overflowY = "scroll";
} else if (top + height - offsetTop > viewportHeight) {
container.style.top = `${viewportHeight - height}px`;
} else {
container.style.top = `${top}px`; </s> remove if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1].focus();
</s> add if (activeElement === container) {
if (event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus();
} else {
focusableElements[0].focus();
}
event.preventDefault();
event.stopImmediatePropagation();
} else if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus(); </s> remove //Position correctly when clicked on rightmost part or the bottom part of viewport
if (x + width - offsetLeft > viewportWidth) {
element.style.left = `${viewportWidth - width - 10}px`;
</s> add // hack for StrictMode so this effect only runs once for
// the same top/left position, otherwise
// we'd potentically reposition twice (once for viewport overflow)
// and once for top/left position afterwards
if (
lastInitializedPosRef.current?.top === top &&
lastInitializedPosRef.current?.left === left
) {
return;
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep keep add keep keep keep keep keep keep
|
<mask> return;
<mask> }
<mask>
<mask> const handleKeyDown = (event: KeyboardEvent) => {
<mask> if (event.key === KEYS.TAB) {
<mask> const focusableElements = queryFocusableElements(container);
<mask> const { activeElement } = document;
<mask> const currentIndex = focusableElements.findIndex(
<mask> (element) => element === activeElement,
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1].focus();
</s> add if (activeElement === container) {
if (event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus();
} else {
focusableElements[0].focus();
}
event.preventDefault();
event.stopImmediatePropagation();
} else if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus(); </s> remove const container = popoverRef.current;
</s> add </s> remove }, [fitInViewport, viewportWidth, viewportHeight, offsetLeft, offsetTop]);
</s> add }, [
top,
left,
fitInViewport,
viewportWidth,
viewportHeight,
offsetLeft,
offsetTop,
]); </s> add const container = popoverRef.current;
</s> remove if (fitInViewport && popoverRef.current) {
const element = popoverRef.current;
const { x, y, width, height } = element.getBoundingClientRect();
</s> add if (fitInViewport && popoverRef.current && top != null && left != null) {
const container = popoverRef.current;
const { width, height } = container.getBoundingClientRect(); </s> remove //Position correctly when clicked on rightmost part or the bottom part of viewport
if (x + width - offsetLeft > viewportWidth) {
element.style.left = `${viewportWidth - width - 10}px`;
</s> add // hack for StrictMode so this effect only runs once for
// the same top/left position, otherwise
// we'd potentically reposition twice (once for viewport overflow)
// and once for top/left position afterwards
if (
lastInitializedPosRef.current?.top === top &&
lastInitializedPosRef.current?.left === left
) {
return;
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> const currentIndex = focusableElements.findIndex(
<mask> (element) => element === activeElement,
<mask> );
<mask>
<mask> if (currentIndex === 0 && event.shiftKey) {
<mask> focusableElements[focusableElements.length - 1].focus();
<mask> event.preventDefault();
<mask> event.stopImmediatePropagation();
<mask> } else if (
<mask> currentIndex === focusableElements.length - 1 &&
<mask> !event.shiftKey
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove focusableElements[0].focus();
</s> add focusableElements[0]?.focus(); </s> add container.focus();
</s> remove //Position correctly when clicked on rightmost part or the bottom part of viewport
if (x + width - offsetLeft > viewportWidth) {
element.style.left = `${viewportWidth - width - 10}px`;
</s> add // hack for StrictMode so this effect only runs once for
// the same top/left position, otherwise
// we'd potentically reposition twice (once for viewport overflow)
// and once for top/left position afterwards
if (
lastInitializedPosRef.current?.top === top &&
lastInitializedPosRef.current?.left === left
) {
return; </s> remove }, [container]);
</s> add }, []);
const lastInitializedPosRef = useRef<{ top: number; left: number } | null>(
null,
); </s> remove if (fitInViewport && popoverRef.current) {
const element = popoverRef.current;
const { x, y, width, height } = element.getBoundingClientRect();
</s> add if (fitInViewport && popoverRef.current && top != null && left != null) {
const container = popoverRef.current;
const { width, height } = container.getBoundingClientRect(); </s> remove element.style.height = `${viewportHeight - 20}px`;
element.style.top = "10px";
element.style.overflowY = "scroll";
}
if (width >= viewportWidth) {
element.style.width = `${viewportWidth}px`;
element.style.left = "0px";
element.style.overflowX = "scroll";
</s> add container.style.height = `${viewportHeight - 20}px`;
container.style.top = "10px";
container.style.overflowY = "scroll";
} else if (top + height - offsetTop > viewportHeight) {
container.style.top = `${viewportHeight - height}px`;
} else {
container.style.top = `${top}px`;
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> } else if (
<mask> currentIndex === focusableElements.length - 1 &&
<mask> !event.shiftKey
<mask> ) {
<mask> focusableElements[0].focus();
<mask> event.preventDefault();
<mask> event.stopImmediatePropagation();
<mask> }
<mask> }
<mask> };
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1].focus();
</s> add if (activeElement === container) {
if (event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus();
} else {
focusableElements[0].focus();
}
event.preventDefault();
event.stopImmediatePropagation();
} else if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus(); </s> add container.focus();
</s> remove //Position correctly when clicked on rightmost part or the bottom part of viewport
if (x + width - offsetLeft > viewportWidth) {
element.style.left = `${viewportWidth - width - 10}px`;
</s> add // hack for StrictMode so this effect only runs once for
// the same top/left position, otherwise
// we'd potentically reposition twice (once for viewport overflow)
// and once for top/left position afterwards
if (
lastInitializedPosRef.current?.top === top &&
lastInitializedPosRef.current?.left === left
) {
return; </s> remove if (y + height - offsetTop > viewportHeight) {
element.style.top = `${viewportHeight - height}px`;
</s> add lastInitializedPosRef.current = { top, left };
if (width >= viewportWidth) {
container.style.width = `${viewportWidth}px`;
container.style.left = "0px";
container.style.overflowX = "scroll";
} else if (left + width - offsetLeft > viewportWidth) {
container.style.left = `${viewportWidth - width - 10}px`;
} else {
container.style.left = `${left}px`; </s> remove element.style.height = `${viewportHeight - 20}px`;
element.style.top = "10px";
element.style.overflowY = "scroll";
}
if (width >= viewportWidth) {
element.style.width = `${viewportWidth}px`;
element.style.left = "0px";
element.style.overflowX = "scroll";
</s> add container.style.height = `${viewportHeight - 20}px`;
container.style.top = "10px";
container.style.overflowY = "scroll";
} else if (top + height - offsetTop > viewportHeight) {
container.style.top = `${viewportHeight - height}px`;
} else {
container.style.top = `${top}px`; </s> remove <div className="popover" style={{ top, left }} ref={popoverRef}>
</s> add <div className="popover" ref={popoverRef} tabIndex={-1}>
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep keep keep keep replace keep keep keep replace replace replace keep keep
|
<mask>
<mask> container.addEventListener("keydown", handleKeyDown);
<mask>
<mask> return () => container.removeEventListener("keydown", handleKeyDown);
<mask> }, [container]);
<mask>
<mask> // ensure the popover doesn't overflow the viewport
<mask> useLayoutEffect(() => {
<mask> if (fitInViewport && popoverRef.current) {
<mask> const element = popoverRef.current;
<mask> const { x, y, width, height } = element.getBoundingClientRect();
<mask>
<mask> //Position correctly when clicked on rightmost part or the bottom part of viewport
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove //Position correctly when clicked on rightmost part or the bottom part of viewport
if (x + width - offsetLeft > viewportWidth) {
element.style.left = `${viewportWidth - width - 10}px`;
</s> add // hack for StrictMode so this effect only runs once for
// the same top/left position, otherwise
// we'd potentically reposition twice (once for viewport overflow)
// and once for top/left position afterwards
if (
lastInitializedPosRef.current?.top === top &&
lastInitializedPosRef.current?.left === left
) {
return; </s> remove if (y + height - offsetTop > viewportHeight) {
element.style.top = `${viewportHeight - height}px`;
</s> add lastInitializedPosRef.current = { top, left };
if (width >= viewportWidth) {
container.style.width = `${viewportWidth}px`;
container.style.left = "0px";
container.style.overflowX = "scroll";
} else if (left + width - offsetLeft > viewportWidth) {
container.style.left = `${viewportWidth - width - 10}px`;
} else {
container.style.left = `${left}px`; </s> remove const container = popoverRef.current;
</s> add </s> add container.focus();
</s> add const container = popoverRef.current;
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep keep keep keep replace replace replace keep replace replace keep keep
|
<mask> if (fitInViewport && popoverRef.current) {
<mask> const element = popoverRef.current;
<mask> const { x, y, width, height } = element.getBoundingClientRect();
<mask>
<mask> //Position correctly when clicked on rightmost part or the bottom part of viewport
<mask> if (x + width - offsetLeft > viewportWidth) {
<mask> element.style.left = `${viewportWidth - width - 10}px`;
<mask> }
<mask> if (y + height - offsetTop > viewportHeight) {
<mask> element.style.top = `${viewportHeight - height}px`;
<mask> }
<mask>
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove if (fitInViewport && popoverRef.current) {
const element = popoverRef.current;
const { x, y, width, height } = element.getBoundingClientRect();
</s> add if (fitInViewport && popoverRef.current && top != null && left != null) {
const container = popoverRef.current;
const { width, height } = container.getBoundingClientRect(); </s> remove //Resize to fit viewport on smaller screens
</s> add </s> remove element.style.height = `${viewportHeight - 20}px`;
element.style.top = "10px";
element.style.overflowY = "scroll";
}
if (width >= viewportWidth) {
element.style.width = `${viewportWidth}px`;
element.style.left = "0px";
element.style.overflowX = "scroll";
</s> add container.style.height = `${viewportHeight - 20}px`;
container.style.top = "10px";
container.style.overflowY = "scroll";
} else if (top + height - offsetTop > viewportHeight) {
container.style.top = `${viewportHeight - height}px`;
} else {
container.style.top = `${top}px`; </s> remove }, [container]);
</s> add }, []);
const lastInitializedPosRef = useRef<{ top: number; left: number } | null>(
null,
); </s> add container.focus();
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep keep replace keep keep keep keep keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep
|
<mask> }
<mask>
<mask> //Resize to fit viewport on smaller screens
<mask> if (height >= viewportHeight) {
<mask> element.style.height = `${viewportHeight - 20}px`;
<mask> element.style.top = "10px";
<mask> element.style.overflowY = "scroll";
<mask> }
<mask>
<mask> //Resize to fit viewport on smaller screens
<mask> if (height >= viewportHeight) {
<mask> element.style.height = `${viewportHeight - 20}px`;
<mask> element.style.top = "10px";
<mask> element.style.overflowY = "scroll";
<mask> }
<mask> if (width >= viewportWidth) {
<mask> element.style.width = `${viewportWidth}px`;
<mask> element.style.left = "0px";
<mask> element.style.overflowX = "scroll";
<mask> }
<mask> }
<mask> }, [fitInViewport, viewportWidth, viewportHeight, offsetLeft, offsetTop]);
<mask>
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove if (y + height - offsetTop > viewportHeight) {
element.style.top = `${viewportHeight - height}px`;
</s> add lastInitializedPosRef.current = { top, left };
if (width >= viewportWidth) {
container.style.width = `${viewportWidth}px`;
container.style.left = "0px";
container.style.overflowX = "scroll";
} else if (left + width - offsetLeft > viewportWidth) {
container.style.left = `${viewportWidth - width - 10}px`;
} else {
container.style.left = `${left}px`; </s> remove }, [fitInViewport, viewportWidth, viewportHeight, offsetLeft, offsetTop]);
</s> add }, [
top,
left,
fitInViewport,
viewportWidth,
viewportHeight,
offsetLeft,
offsetTop,
]); </s> remove //Position correctly when clicked on rightmost part or the bottom part of viewport
if (x + width - offsetLeft > viewportWidth) {
element.style.left = `${viewportWidth - width - 10}px`;
</s> add // hack for StrictMode so this effect only runs once for
// the same top/left position, otherwise
// we'd potentically reposition twice (once for viewport overflow)
// and once for top/left position afterwards
if (
lastInitializedPosRef.current?.top === top &&
lastInitializedPosRef.current?.left === left
) {
return; </s> remove if (fitInViewport && popoverRef.current) {
const element = popoverRef.current;
const { x, y, width, height } = element.getBoundingClientRect();
</s> add if (fitInViewport && popoverRef.current && top != null && left != null) {
const container = popoverRef.current;
const { width, height } = container.getBoundingClientRect(); </s> add container.focus();
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> element.style.left = "0px";
<mask> element.style.overflowX = "scroll";
<mask> }
<mask> }
<mask> }, [fitInViewport, viewportWidth, viewportHeight, offsetLeft, offsetTop]);
<mask>
<mask> useEffect(() => {
<mask> if (onCloseRequest) {
<mask> const handler = (event: PointerEvent) => {
<mask> if (!popoverRef.current?.contains(event.target as Node)) {
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove element.style.height = `${viewportHeight - 20}px`;
element.style.top = "10px";
element.style.overflowY = "scroll";
}
if (width >= viewportWidth) {
element.style.width = `${viewportWidth}px`;
element.style.left = "0px";
element.style.overflowX = "scroll";
</s> add container.style.height = `${viewportHeight - 20}px`;
container.style.top = "10px";
container.style.overflowY = "scroll";
} else if (top + height - offsetTop > viewportHeight) {
container.style.top = `${viewportHeight - height}px`;
} else {
container.style.top = `${top}px`; </s> add container.focus();
</s> remove const container = popoverRef.current;
</s> add </s> add const container = popoverRef.current;
</s> remove if (y + height - offsetTop > viewportHeight) {
element.style.top = `${viewportHeight - height}px`;
</s> add lastInitializedPosRef.current = { top, left };
if (width >= viewportWidth) {
container.style.width = `${viewportWidth}px`;
container.style.left = "0px";
container.style.overflowX = "scroll";
} else if (left + width - offsetLeft > viewportWidth) {
container.style.left = `${viewportWidth - width - 10}px`;
} else {
container.style.left = `${left}px`; </s> remove if (fitInViewport && popoverRef.current) {
const element = popoverRef.current;
const { x, y, width, height } = element.getBoundingClientRect();
</s> add if (fitInViewport && popoverRef.current && top != null && left != null) {
const container = popoverRef.current;
const { width, height } = container.getBoundingClientRect();
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep keep keep keep replace keep keep keep keep
|
<mask> }
<mask> }, [onCloseRequest]);
<mask>
<mask> return (
<mask> <div className="popover" style={{ top, left }} ref={popoverRef}>
<mask> {children}
<mask> </div>
<mask> );
<mask> };
</s> fix: fixing popover overflow on small screen (#6433)
Co-authored-by: dwelle <[email protected]> </s> remove }, [container]);
</s> add }, []);
const lastInitializedPosRef = useRef<{ top: number; left: number } | null>(
null,
); </s> remove focusableElements[0].focus();
</s> add focusableElements[0]?.focus(); </s> remove if (y + height - offsetTop > viewportHeight) {
element.style.top = `${viewportHeight - height}px`;
</s> add lastInitializedPosRef.current = { top, left };
if (width >= viewportWidth) {
container.style.width = `${viewportWidth}px`;
container.style.left = "0px";
container.style.overflowX = "scroll";
} else if (left + width - offsetLeft > viewportWidth) {
container.style.left = `${viewportWidth - width - 10}px`;
} else {
container.style.left = `${left}px`; </s> remove }, [fitInViewport, viewportWidth, viewportHeight, offsetLeft, offsetTop]);
</s> add }, [
top,
left,
fitInViewport,
viewportWidth,
viewportHeight,
offsetLeft,
offsetTop,
]); </s> remove if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1].focus();
</s> add if (activeElement === container) {
if (event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus();
} else {
focusableElements[0].focus();
}
event.preventDefault();
event.stopImmediatePropagation();
} else if (currentIndex === 0 && event.shiftKey) {
focusableElements[focusableElements.length - 1]?.focus(); </s> remove if (fitInViewport && popoverRef.current) {
const element = popoverRef.current;
const { x, y, width, height } = element.getBoundingClientRect();
</s> add if (fitInViewport && popoverRef.current && top != null && left != null) {
const container = popoverRef.current;
const { width, height } = container.getBoundingClientRect();
|
https://github.com/excalidraw/excalidraw/commit/fc601347cf57a55bbeed143dd66764ac770c2fbd
|
src/components/Popover.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> label={t("toolBar.freedraw")}
<mask> shortcuts={["Shift+P", "7"]}
<mask> />
<mask> <Shortcut label={t("toolBar.text")} shortcuts={["T", "8"]} />
<mask> <Shortcut
<mask> label={t("helpDialog.textNewLine")}
<mask> shortcuts={[
<mask> getShortcutKey("Enter"),
<mask> getShortcutKey("Shift+Enter"),
<mask> ]}
</s> feat: add hint around text editing (#3708) </s> remove "textFinish": "Finish editing (text)",
"textNewLine": "Add new line (text)",
</s> add "textFinish": "Finish editing (text editor)",
"textNewLine": "Add new line (text editor)", </s> add "editSelectedShape": "Edit selected shape (text/arrow/line)", </s> add "doubleClick": "double-click", </s> add "text_selected": "Double-click or press ENTER to edit text",
"text_editing": "Press Escape or CtrlOrCmd+ENTER to finish editing", </s> add if (selectedElements.length === 1 && isTextElement(selectedElements[0])) {
return t("hints.text_selected");
}
if (appState.editingElement && isTextElement(appState.editingElement)) {
return t("hints.text_editing");
}
</s> remove import { isLinearElement } from "../element/typeChecks";
</s> add import { isLinearElement, isTextElement } from "../element/typeChecks";
|
https://github.com/excalidraw/excalidraw/commit/fd4460be3787088a5a46daecedc52aabb00cc9b9
|
src/components/HelpDialog.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { getSelectedElements } from "../scene";
<mask>
<mask> import "./HintViewer.scss";
<mask> import { AppState } from "../types";
<mask> import { isLinearElement } from "../element/typeChecks";
<mask> import { getShortcutKey } from "../utils";
<mask>
<mask> interface Hint {
<mask> appState: AppState;
<mask> elements: readonly NonDeletedExcalidrawElement[];
</s> feat: add hint around text editing (#3708) </s> add if (selectedElements.length === 1 && isTextElement(selectedElements[0])) {
return t("hints.text_selected");
}
if (appState.editingElement && isTextElement(appState.editingElement)) {
return t("hints.text_editing");
}
</s> add "text_selected": "Double-click or press ENTER to edit text",
"text_editing": "Press Escape or CtrlOrCmd+ENTER to finish editing", </s> remove "textFinish": "Finish editing (text)",
"textNewLine": "Add new line (text)",
</s> add "textFinish": "Finish editing (text editor)",
"textNewLine": "Add new line (text editor)", </s> add "editSelectedShape": "Edit selected shape (text/arrow/line)", </s> add "doubleClick": "double-click", </s> add <Shortcut
label={t("helpDialog.editSelectedShape")}
shortcuts={[
getShortcutKey("Enter"),
t("helpDialog.doubleClick"),
]}
/>
|
https://github.com/excalidraw/excalidraw/commit/fd4460be3787088a5a46daecedc52aabb00cc9b9
|
src/components/HintViewer.tsx
|
keep keep keep add keep keep keep keep
|
<mask> }
<mask> return t("hints.lineEditor_info");
<mask> }
<mask>
<mask> return null;
<mask> };
<mask>
<mask> export const HintViewer = ({ appState, elements }: Hint) => {
</s> feat: add hint around text editing (#3708) </s> remove import { isLinearElement } from "../element/typeChecks";
</s> add import { isLinearElement, isTextElement } from "../element/typeChecks"; </s> remove "textFinish": "Finish editing (text)",
"textNewLine": "Add new line (text)",
</s> add "textFinish": "Finish editing (text editor)",
"textNewLine": "Add new line (text editor)", </s> add "editSelectedShape": "Edit selected shape (text/arrow/line)", </s> add "doubleClick": "double-click", </s> add "text_selected": "Double-click or press ENTER to edit text",
"text_editing": "Press Escape or CtrlOrCmd+ENTER to finish editing", </s> add <Shortcut
label={t("helpDialog.editSelectedShape")}
shortcuts={[
getShortcutKey("Enter"),
t("helpDialog.doubleClick"),
]}
/>
|
https://github.com/excalidraw/excalidraw/commit/fd4460be3787088a5a46daecedc52aabb00cc9b9
|
src/components/HintViewer.tsx
|
keep add keep keep keep keep keep
|
<mask> "freeDraw": "Click and drag, release when you're finished",
<mask> "text": "Tip: you can also add text by double-clicking anywhere with the selection tool",
<mask> "linearElementMulti": "Click on last point or press Escape or Enter to finish",
<mask> "lockAngle": "You can constrain angle by holding SHIFT",
<mask> "resize": "You can constrain proportions by holding SHIFT while resizing,\nhold ALT to resize from the center",
<mask> "rotate": "You can constrain angles by holding SHIFT while rotating",
<mask> "lineEditor_info": "Double-click or press Enter to edit points",
</s> feat: add hint around text editing (#3708) </s> remove "textFinish": "Finish editing (text)",
"textNewLine": "Add new line (text)",
</s> add "textFinish": "Finish editing (text editor)",
"textNewLine": "Add new line (text editor)", </s> remove import { isLinearElement } from "../element/typeChecks";
</s> add import { isLinearElement, isTextElement } from "../element/typeChecks"; </s> add "editSelectedShape": "Edit selected shape (text/arrow/line)", </s> add "doubleClick": "double-click", </s> add if (selectedElements.length === 1 && isTextElement(selectedElements[0])) {
return t("hints.text_selected");
}
if (appState.editingElement && isTextElement(appState.editingElement)) {
return t("hints.text_editing");
}
</s> add <Shortcut
label={t("helpDialog.editSelectedShape")}
shortcuts={[
getShortcutKey("Enter"),
t("helpDialog.doubleClick"),
]}
/>
|
https://github.com/excalidraw/excalidraw/commit/fd4460be3787088a5a46daecedc52aabb00cc9b9
|
src/locales/en.json
|
keep keep add keep keep keep keep
|
<mask> "curvedArrow": "Curved arrow",
<mask> "curvedLine": "Curved line",
<mask> "documentation": "Documentation",
<mask> "drag": "drag",
<mask> "editor": "Editor",
<mask> "editSelectedShape": "Edit selected shape (text/arrow/line)",
<mask> "github": "Found an issue? Submit",
</s> feat: add hint around text editing (#3708) </s> add "editSelectedShape": "Edit selected shape (text/arrow/line)", </s> remove "textFinish": "Finish editing (text)",
"textNewLine": "Add new line (text)",
</s> add "textFinish": "Finish editing (text editor)",
"textNewLine": "Add new line (text editor)", </s> add "text_selected": "Double-click or press ENTER to edit text",
"text_editing": "Press Escape or CtrlOrCmd+ENTER to finish editing", </s> add if (selectedElements.length === 1 && isTextElement(selectedElements[0])) {
return t("hints.text_selected");
}
if (appState.editingElement && isTextElement(appState.editingElement)) {
return t("hints.text_editing");
}
</s> remove import { isLinearElement } from "../element/typeChecks";
</s> add import { isLinearElement, isTextElement } from "../element/typeChecks"; </s> add <Shortcut
label={t("helpDialog.editSelectedShape")}
shortcuts={[
getShortcutKey("Enter"),
t("helpDialog.doubleClick"),
]}
/>
|
https://github.com/excalidraw/excalidraw/commit/fd4460be3787088a5a46daecedc52aabb00cc9b9
|
src/locales/en.json
|
keep keep keep add keep keep keep keep
|
<mask> "documentation": "Documentation",
<mask> "doubleClick": "double-click",
<mask> "drag": "drag",
<mask> "editor": "Editor",
<mask> "github": "Found an issue? Submit",
<mask> "howto": "Follow our guides",
<mask> "or": "or",
<mask> "preventBinding": "Prevent arrow binding",
</s> feat: add hint around text editing (#3708) </s> add "doubleClick": "double-click", </s> remove "textFinish": "Finish editing (text)",
"textNewLine": "Add new line (text)",
</s> add "textFinish": "Finish editing (text editor)",
"textNewLine": "Add new line (text editor)", </s> add "text_selected": "Double-click or press ENTER to edit text",
"text_editing": "Press Escape or CtrlOrCmd+ENTER to finish editing", </s> add if (selectedElements.length === 1 && isTextElement(selectedElements[0])) {
return t("hints.text_selected");
}
if (appState.editingElement && isTextElement(appState.editingElement)) {
return t("hints.text_editing");
}
</s> remove import { isLinearElement } from "../element/typeChecks";
</s> add import { isLinearElement, isTextElement } from "../element/typeChecks"; </s> add <Shortcut
label={t("helpDialog.editSelectedShape")}
shortcuts={[
getShortcutKey("Enter"),
t("helpDialog.doubleClick"),
]}
/>
|
https://github.com/excalidraw/excalidraw/commit/fd4460be3787088a5a46daecedc52aabb00cc9b9
|
src/locales/en.json
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.