From ef94ad7df2a087141ddb8d347d3e3c484ff7609b Mon Sep 17 00:00:00 2001 From: Sam Wilkins Date: Tue, 3 Dec 2019 01:46:36 -0500 Subject: const linter rule and restored google docs push, fixed routing --- src/client/views/GlobalKeyHandler.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/client/views/GlobalKeyHandler.ts') diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts index 8f397e331..edc7df12a 100644 --- a/src/client/views/GlobalKeyHandler.ts +++ b/src/client/views/GlobalKeyHandler.ts @@ -25,7 +25,7 @@ export default class KeyManager { private router = new Map(); constructor() { - let isMac = navigator.platform.toLowerCase().indexOf("mac") >= 0; + const isMac = navigator.platform.toLowerCase().indexOf("mac") >= 0; // SHIFT CONTROL ALT META this.router.set("0000", this.unmodified); @@ -36,22 +36,22 @@ export default class KeyManager { } public handle = async (e: KeyboardEvent) => { - let keyname = e.key && e.key.toLowerCase(); + const keyname = e.key && e.key.toLowerCase(); this.handleGreedy(keyname); if (modifiers.includes(keyname)) { return; } - let bit = (value: boolean) => value ? "1" : "0"; - let modifierIndex = bit(e.shiftKey) + bit(e.ctrlKey) + bit(e.altKey) + bit(e.metaKey); + const bit = (value: boolean) => value ? "1" : "0"; + const modifierIndex = bit(e.shiftKey) + bit(e.ctrlKey) + bit(e.altKey) + bit(e.metaKey); - let handleConstrained = this.router.get(modifierIndex); + const handleConstrained = this.router.get(modifierIndex); if (!handleConstrained) { return; } - let control = await handleConstrained(keyname, e); + const control = await handleConstrained(keyname, e); control.stopPropagation && e.stopPropagation(); control.preventDefault && e.preventDefault(); @@ -65,7 +65,7 @@ export default class KeyManager { private unmodified = action((keyname: string, e: KeyboardEvent) => { switch (keyname) { case "escape": - let main = MainView.Instance; + const main = MainView.Instance; InkingControl.Instance.switchTool(InkTool.None); if (main.isPointerDown) { DragManager.AbortDrag(); @@ -89,8 +89,8 @@ export default class KeyManager { } UndoManager.RunInBatch(() => { SelectionManager.SelectedDocuments().map(docView => { - let doc = docView.props.Document; - let remove = docView.props.removeDocument; + const doc = docView.props.Document; + const remove = docView.props.removeDocument; remove && remove(doc); }); }, "delete"); @@ -121,8 +121,8 @@ export default class KeyManager { } private alt = action((keyname: string) => { - let stopPropagation = true; - let preventDefault = true; + const stopPropagation = true; + const preventDefault = true; switch (keyname) { // case "n": @@ -190,7 +190,7 @@ export default class KeyManager { } break; case "o": - let target = SelectionManager.SelectedDocuments()[0]; + const target = SelectionManager.SelectedDocuments()[0]; target && CollectionDockingView.Instance && CollectionDockingView.Instance.OpenFullScreen(target); break; case "r": @@ -220,12 +220,12 @@ export default class KeyManager { }); async printClipboard() { - let text: string = await navigator.clipboard.readText(); + const text: string = await navigator.clipboard.readText(); } private ctrl_shift = action((keyname: string) => { - let stopPropagation = true; - let preventDefault = true; + const stopPropagation = true; + const preventDefault = true; switch (keyname) { case "z": -- cgit v1.2.3-70-g09d2 From c9c91b0e74934e36514916786da8822b1f3c05f3 Mon Sep 17 00:00:00 2001 From: bob Date: Mon, 9 Dec 2019 16:03:26 -0500 Subject: from last --- src/client/views/GlobalKeyHandler.ts | 2 +- src/client/views/nodes/FormattedTextBox.scss | 30 ++++++++++++---------------- 2 files changed, 14 insertions(+), 18 deletions(-) (limited to 'src/client/views/GlobalKeyHandler.ts') diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts index edc7df12a..bce33531d 100644 --- a/src/client/views/GlobalKeyHandler.ts +++ b/src/client/views/GlobalKeyHandler.ts @@ -108,7 +108,7 @@ export default class KeyManager { let preventDefault = false; switch (keyname) { - case " ": + case "~": DictationManager.Controls.listen({ useOverlay: true, tryExecute: true }); stopPropagation = true; preventDefault = true; diff --git a/src/client/views/nodes/FormattedTextBox.scss b/src/client/views/nodes/FormattedTextBox.scss index 8256cffac..ed320bdcd 100644 --- a/src/client/views/nodes/FormattedTextBox.scss +++ b/src/client/views/nodes/FormattedTextBox.scss @@ -238,23 +238,19 @@ footnote::after { margin-left: 1em; font-family: inherit; } - p { - display: inline; - font-family: inherit; - } - - .decimal1-ol { counter-reset: deci1; margin-left: 0; } - .decimal2-ol { counter-reset: deci2; font-size: smaller; padding-left: 1em;} - .decimal3-ol { counter-reset: deci3; font-size: smaller; padding-left: 2em;} - .decimal4-ol { counter-reset: deci4; font-size: smaller; padding-left: 3em;} - .decimal5-ol { counter-reset: deci5; font-size: smaller; } - .decimal6-ol { counter-reset: deci6; font-size: smaller; } - .decimal7-ol { counter-reset: deci7; font-size: smaller; } - - .multi1-ol { counter-reset: multi1; margin-left: 0; padding-left: 1.2em } - .multi2-ol { counter-reset: multi2; font-size: smaller; padding-left: 1.4em;} - .multi3-ol { counter-reset: multi3; font-size: smaller; padding-left: 2em;} - .multi4-ol { counter-reset: multi4; font-size: smaller; padding-left: 3.4em;} + + .decimal1-ol { counter-reset: deci1; p {display: inline; font-family: inherit} margin-left: 0; } + .decimal2-ol { counter-reset: deci2; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 1em;} + .decimal3-ol { counter-reset: deci3; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 2em;} + .decimal4-ol { counter-reset: deci4; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 3em;} + .decimal5-ol { counter-reset: deci5; p {display: inline; font-family: inherit} font-size: smaller; } + .decimal6-ol { counter-reset: deci6; p {display: inline; font-family: inherit} font-size: smaller; } + .decimal7-ol { counter-reset: deci7; p {display: inline; font-family: inherit} font-size: smaller; } + + .multi1-ol { counter-reset: multi1; p {display: inline; font-family: inherit} margin-left: 0; padding-left: 1.2em } + .multi2-ol { counter-reset: multi2; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 1.4em;} + .multi3-ol { counter-reset: multi3; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 2em;} + .multi4-ol { counter-reset: multi4; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 3.4em;} .decimal1:before { transition: 0.5s;counter-increment: deci1; display: inline-block; margin-left: -1em; width: 1em; content: counter(deci1) ". "; } .decimal2:before { transition: 0.5s;counter-increment: deci2; display: inline-block; margin-left: -2.1em; width: 2.1em; content: counter(deci1) "."counter(deci2) ". "; } -- cgit v1.2.3-70-g09d2 From 7472ef16f30edec4647233c58e570367ccb37c4d Mon Sep 17 00:00:00 2001 From: bob Date: Mon, 16 Dec 2019 12:12:24 -0500 Subject: from last --- src/client/views/GlobalKeyHandler.ts | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/client/views/GlobalKeyHandler.ts') diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts index bce33531d..c48e1df4f 100644 --- a/src/client/views/GlobalKeyHandler.ts +++ b/src/client/views/GlobalKeyHandler.ts @@ -12,6 +12,7 @@ import { Cast, PromiseValue } from "../../new_fields/Types"; import { ScriptField } from "../../new_fields/ScriptField"; import { InkingControl } from "./InkingControl"; import { InkTool } from "../../new_fields/InkField"; +import { DocumentView } from "./nodes/DocumentView"; const modifiers = ["control", "meta", "shift", "alt"]; type KeyHandler = (keycode: string, e: KeyboardEvent) => KeyControlInfo | Promise; @@ -125,6 +126,13 @@ export default class KeyManager { const preventDefault = true; switch (keyname) { + case "f": + let dv = SelectionManager.SelectedDocuments()?.[0]; + if (dv) { + const ex = dv.props.ScreenToLocalTransform().inverse().transformPoint(0, 0)[0]; + const ey = dv.props.ScreenToLocalTransform().inverse().transformPoint(0, 0)[1]; + DocumentView.FloatDoc(dv, ex, ey); + } // case "n": // let toggle = MainView.Instance.addMenuToggle.current!; // toggle.checked = !toggle.checked; -- cgit v1.2.3-70-g09d2 From 16c84a8042fc3e9d7af3d74fce2758bf6862a5a2 Mon Sep 17 00:00:00 2001 From: Bob Zeleznik Date: Tue, 17 Dec 2019 20:55:38 -0500 Subject: warnings and fix to doc decorations close button to deselect first --- src/client/views/DocumentDecorations.tsx | 5 +++-- src/client/views/GlobalKeyHandler.ts | 2 +- src/client/views/MainView.scss | 4 ++-- src/client/views/collections/ParentDocumentSelector.tsx | 2 +- src/client/views/nodes/DocumentBox.tsx | 3 +++ 5 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/client/views/GlobalKeyHandler.ts') diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx index fdaca87a9..228cea00e 100644 --- a/src/client/views/DocumentDecorations.tsx +++ b/src/client/views/DocumentDecorations.tsx @@ -233,11 +233,12 @@ export class DocumentDecorations extends React.Component<{}, { value: string }> e.stopPropagation(); if (e.button === 0) { const recent = Cast(CurrentUserUtils.UserDocument.recentlyClosed, Doc) as Doc; - SelectionManager.SelectedDocuments().map(dv => { + let selected = SelectionManager.SelectedDocuments().slice(); + SelectionManager.DeselectAll(); + selected.map(dv => { recent && Doc.AddDocToList(recent, "data", dv.props.Document, undefined, true, true); dv.props.removeDocument && dv.props.removeDocument(dv.props.Document); }); - SelectionManager.DeselectAll(); document.removeEventListener("pointermove", this.onCloseMove); document.removeEventListener("pointerup", this.onCloseUp); } diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts index c48e1df4f..979687ffb 100644 --- a/src/client/views/GlobalKeyHandler.ts +++ b/src/client/views/GlobalKeyHandler.ts @@ -127,7 +127,7 @@ export default class KeyManager { switch (keyname) { case "f": - let dv = SelectionManager.SelectedDocuments()?.[0]; + const dv = SelectionManager.SelectedDocuments()?.[0]; if (dv) { const ex = dv.props.ScreenToLocalTransform().inverse().transformPoint(0, 0)[0]; const ey = dv.props.ScreenToLocalTransform().inverse().transformPoint(0, 0)[1]; diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss index a8924c6b1..51a062118 100644 --- a/src/client/views/MainView.scss +++ b/src/client/views/MainView.scss @@ -70,7 +70,7 @@ position: absolute; display: flex; flex-direction: column; - z-index: 1; + z-index: 2; } .mainView-expandFlyoutButton { @@ -88,7 +88,7 @@ border: 1px solid black; border-radius: 5px; position: absolute; - z-index: 1; + z-index: 2; touch-action: none; cursor: ew-resize; } diff --git a/src/client/views/collections/ParentDocumentSelector.tsx b/src/client/views/collections/ParentDocumentSelector.tsx index ffaf41b91..422d01cee 100644 --- a/src/client/views/collections/ParentDocumentSelector.tsx +++ b/src/client/views/collections/ParentDocumentSelector.tsx @@ -118,7 +118,7 @@ export class ButtonSelector extends React.Component<{ Document: Doc, Stack: any render() { const view = DocumentManager.Instance.getDocumentView(this.props.Document); - let flyout = ( + const flyout = (
diff --git a/src/client/views/nodes/DocumentBox.tsx b/src/client/views/nodes/DocumentBox.tsx index 6be0289d7..94755afec 100644 --- a/src/client/views/nodes/DocumentBox.tsx +++ b/src/client/views/nodes/DocumentBox.tsx @@ -33,6 +33,9 @@ export class DocumentBox extends DocComponent(DocB } }); } + componentWillUnmount() { + this._prevSelectionDisposer && this._prevSelectionDisposer(); + } specificContextMenu = (e: React.MouseEvent): void => { const funcs: ContextMenuProps[] = []; funcs.push({ description: (this.isSelectionLocked() ? "Show" : "Lock") + " Selection", event: () => this.toggleLockSelection, icon: "expand-arrows-alt" }); -- cgit v1.2.3-70-g09d2