diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/util/ProsemirrorKeymap.ts | 17 | ||||
| -rw-r--r-- | src/client/util/TooltipTextMenu.scss | 11 | ||||
| -rw-r--r-- | src/client/util/TooltipTextMenu.tsx | 24 | ||||
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/MarqueeView.tsx | 9 |
4 files changed, 31 insertions, 30 deletions
diff --git a/src/client/util/ProsemirrorKeymap.ts b/src/client/util/ProsemirrorKeymap.ts index 89d01486e..cf656dc17 100644 --- a/src/client/util/ProsemirrorKeymap.ts +++ b/src/client/util/ProsemirrorKeymap.ts @@ -24,22 +24,6 @@ export default function buildKeymap<S extends Schema<any>>(schema: S, mapKeys?: keys[key] = cmd; } - function insertStar(state: EditorState<S>, dispatch: ((tr: Transaction<S>) => void)) { - console.log("creating star..."); - let type = schema.nodes.star as NodeType<S>; - let { $from } = state.selection; - if (!$from.parent.canReplaceWith($from.index(), $from.index(), type)) { - return false; - } - if (dispatch) { - dispatch(state.tr.replaceSelectionWith(type.create())); - } - return true; - } - - console.log("star? hullo"); - bind("Mod-space", insertStar); - bind("Mod-z", undo); bind("Shift-Mod-z", redo); bind("Backspace", undoInputRule); @@ -95,7 +79,6 @@ export default function buildKeymap<S extends Schema<any>>(schema: S, mapKeys?: } if (type = schema.nodes.paragraph) { bind("Shift-Ctrl-0", setBlockType(type)); - bind("Mod-space", insertStar); } if (type = schema.nodes.code_block) { bind("Shift-Ctrl-\\", setBlockType(type)); diff --git a/src/client/util/TooltipTextMenu.scss b/src/client/util/TooltipTextMenu.scss index 0720a73a3..0099c1e4d 100644 --- a/src/client/util/TooltipTextMenu.scss +++ b/src/client/util/TooltipTextMenu.scss @@ -239,12 +239,13 @@ border: 1px solid silver; border-radius: 15px; padding: 2px 10px; - margin-bottom: 60px; - -webkit-transform: translateX(-50%); - transform: translateX(-50%); + //margin-bottom: 100px; + //-webkit-transform: translateX(-50%); + //transform: translateX(-50%); + transform: translateY(-50%); pointer-events: all; - height: 100px; - width:500px; + height: 125px; + width:400px; .ProseMirror-example-setup-style hr { padding: 2px 10px; border: none; diff --git a/src/client/util/TooltipTextMenu.tsx b/src/client/util/TooltipTextMenu.tsx index 1f1ad9cd4..366105ad9 100644 --- a/src/client/util/TooltipTextMenu.tsx +++ b/src/client/util/TooltipTextMenu.tsx @@ -234,7 +234,12 @@ export class TooltipTextMenu { this.tooltip.appendChild(this.linkEditor); let starButton = document.createElement("button"); - starButton.textContent = "ST"; + // starButton.style.width = '10px'; + // starButton.style.height = '10px'; + starButton.style.marginLeft = '10px'; + starButton.textContent = "Summarize"; + starButton.style.color = 'black'; + starButton.style.backgroundColor = 'white'; starButton.onclick = () => { let state = this.view.state; this.insertStar(state, this.view.dispatch); @@ -266,16 +271,21 @@ export class TooltipTextMenu { link = node && node.marks.find(m => m.type.name === "link"); } - insertStar(state: any, dispatch: any) { + insertStar(state: EditorState<any>, dispatch: any) { console.log("creating star..."); let type = schema.nodes.star; - let { $from } = state.selection; - if (!$from.parent.canReplaceWith($from.index(), $from.index(), type)) { - return false; - } + //let {$from} = state.selection; + let select = state.selection; if (dispatch) { - dispatch(state.tr.replaceSelectionWith(type.create())); + dispatch(state.tr.setMeta('select.visible', false)); } + // console.log($from); + // if (!$from.parent.canReplaceWith($from.index(), $from.index(), type)) { + // return false; + // } + // if (dispatch) { + // dispatch(state.tr.replaceSelectionWith(type.create())); + // } return true; } diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx index 563fbb186..6b81cc597 100644 --- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx +++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx @@ -147,6 +147,7 @@ export class MarqueeView extends React.Component<MarqueeViewProps> this._downY = this._lastY = e.pageY; this._commandExecuted = false; PreviewCursor.Visible = false; + this.cleanupInteractions(true); if (e.button === 2 || (e.button === 0 && e.altKey)) { if (!this.props.container.props.active()) this.props.selectDocuments([this.props.container.props.Document]); document.addEventListener("pointermove", this.onPointerMove, true); @@ -184,13 +185,19 @@ export class MarqueeView extends React.Component<MarqueeViewProps> onPointerUp = (e: PointerEvent): void => { console.log("pointer up!"); if (this._visible) { + console.log("visible"); let mselect = this.marqueeSelect(); if (!e.shiftKey) { SelectionManager.DeselectAll(mselect.length ? undefined : this.props.container.props.Document); } this.props.selectDocuments(mselect.length ? mselect : [this.props.container.props.Document]); + mselect.length ? this.cleanupInteractions(true, false) : this.cleanupInteractions(true); } - this.cleanupInteractions(true, false); + else { + console.log("invisible"); + this.cleanupInteractions(true); + } + if (e.altKey) { e.preventDefault(); } |