diff options
Diffstat (limited to 'src/client/views')
9 files changed, 47 insertions, 24 deletions
diff --git a/src/client/views/LightboxView.tsx b/src/client/views/LightboxView.tsx index 3fc72c45c..9b14c180e 100644 --- a/src/client/views/LightboxView.tsx +++ b/src/client/views/LightboxView.tsx @@ -260,7 +260,7 @@ export class LightboxView extends React.Component<LightboxViewProps> { })} <LightboxTourBtn navBtn={this.navBtn} future={this.future} stepInto={this.stepInto} tourMap={this.tourMap} /> <div className="lightboxView-navBtn" title={"toggle fit width"} style={{ position: "absolute", right: 10, top: 10, color: "white" }} - onClick={e => { e.stopPropagation(); LightboxView.LightboxDoc!._fitWidth = !LightboxView.LightboxDoc!._fitWidth }}> + onClick={e => { e.stopPropagation(); LightboxView.LightboxDoc!._fitWidth = !LightboxView.LightboxDoc!._fitWidth; }}> <FontAwesomeIcon icon={"arrows-alt-h"} size="2x" /> </div> </div>; diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx index 550a4082b..0c8e26e91 100644 --- a/src/client/views/collections/CollectionDockingView.tsx +++ b/src/client/views/collections/CollectionDockingView.tsx @@ -400,7 +400,7 @@ export class CollectionDockingView extends CollectionSubView(doc => doc) { const emptyPane = CurrentUserUtils.EmptyPane; emptyPane["dragFactory-count"] = NumCast(emptyPane["dragFactory-count"]) + 1; CollectionDockingView.AddSplit(Docs.Create.FreeformDocument([], { - _width: this.props.PanelWidth(), _height: this.props.PanelHeight(), title: `Untitled Tab ${NumCast(emptyPane["dragFactory-count"])}` + _width: this.props.PanelWidth(), _height: this.props.PanelHeight(), _fitWidth: true, title: `Untitled Tab ${NumCast(emptyPane["dragFactory-count"])}` }), "", stack); } }); @@ -423,7 +423,7 @@ export class CollectionDockingView extends CollectionSubView(doc => doc) { const emptyPane = CurrentUserUtils.EmptyPane; emptyPane["dragFactory-count"] = NumCast(emptyPane["dragFactory-count"]) + 1; CollectionDockingView.AddSplit(Docs.Create.FreeformDocument([], { - _width: this.props.PanelWidth(), _height: this.props.PanelHeight(), title: `Untitled Tab ${NumCast(emptyPane["dragFactory-count"])}` + _width: this.props.PanelWidth(), _height: this.props.PanelHeight(), _fitWidth: true, title: `Untitled Tab ${NumCast(emptyPane["dragFactory-count"])}` }), "", stack); })); } diff --git a/src/client/views/collections/CollectionSubView.tsx b/src/client/views/collections/CollectionSubView.tsx index 639650b94..e5c835f39 100644 --- a/src/client/views/collections/CollectionSubView.tsx +++ b/src/client/views/collections/CollectionSubView.tsx @@ -230,7 +230,7 @@ export function CollectionSubView<T, X>(schemaCtor: (doc: Doc) => T, moreProps?: const dropped = dropCreator(this.props.isAnnotationOverlay ? this.rootDoc : undefined); this.addDocument(dropped); return dropped; - } + }; return true; } return false; diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx index 9e312b03f..b14949d47 100644 --- a/src/client/views/collections/CollectionTreeView.tsx +++ b/src/client/views/collections/CollectionTreeView.tsx @@ -173,6 +173,8 @@ export class layerProvider={this.props.layerProvider} PanelWidth={this.rtfWidth} PanelHeight={this.rtfOutlineHeight} + NativeWidth={this.rtfWidth} + NativeHeight={this.rtfOutlineHeight} focus={this.props.focus} ScreenToLocalTransform={this.titleTransform} docFilters={returnEmptyFilter} diff --git a/src/client/views/collections/TreeView.tsx b/src/client/views/collections/TreeView.tsx index e383cf176..e80cc970b 100644 --- a/src/client/views/collections/TreeView.tsx +++ b/src/client/views/collections/TreeView.tsx @@ -597,8 +597,8 @@ export class TreeView extends React.Component<TreeViewProps> { moveDocument={this.move} removeDocument={this.props.removeDoc} ScreenToLocalTransform={this.getTransform} - NativeHeight={returnZero} - NativeWidth={returnZero} + NativeHeight={() => 18} + NativeWidth={this.truncateTitleWidth} PanelWidth={this.truncateTitleWidth} PanelHeight={() => 18} contextMenuItems={this.contextMenuItems} diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx index af8ccb9c5..74f00d1b3 100644 --- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx +++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx @@ -284,7 +284,7 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P this.bringToFront(dropDoc); } return dropDoc || this.rootDoc; - } + }; return true; } diff --git a/src/client/views/nodes/EquationBox.tsx b/src/client/views/nodes/EquationBox.tsx index 5bb904f91..f49405d02 100644 --- a/src/client/views/nodes/EquationBox.tsx +++ b/src/client/views/nodes/EquationBox.tsx @@ -2,6 +2,7 @@ import EquationEditor from 'equation-editor-react'; import { action, reaction } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; +import { WidthSym } from '../../../fields/Doc'; import { documentSchema } from '../../../fields/documentSchemas'; import { Id } from '../../../fields/FieldSymbols'; import { createSchema, makeInterface } from '../../../fields/Schema'; @@ -11,11 +12,7 @@ import { Docs } from '../../documents/Documents'; import { ViewBoxBaseComponent } from '../DocComponent'; import { LightboxView } from '../LightboxView'; import { FieldView, FieldViewProps } from './FieldView'; -import './LabelBox.scss'; -import functionPlot from "function-plot"; -import { DocumentManager } from '../../util/DocumentManager'; -import { Utils } from '../../../Utils'; -import { HeightSym, WidthSym } from '../../../fields/Doc'; +import './EquationBox.scss'; const EquationSchema = createSchema({}); diff --git a/src/client/views/nodes/FunctionPlotBox.tsx b/src/client/views/nodes/FunctionPlotBox.tsx index dba08b506..f35677014 100644 --- a/src/client/views/nodes/FunctionPlotBox.tsx +++ b/src/client/views/nodes/FunctionPlotBox.tsx @@ -3,14 +3,16 @@ import functionPlot from "function-plot"; import { observer } from 'mobx-react'; import * as React from 'react'; import { documentSchema } from '../../../fields/documentSchemas'; -import { createSchema, makeInterface } from '../../../fields/Schema'; -import { StrCast } from '../../../fields/Types'; +import { createSchema, makeInterface, listSpec } from '../../../fields/Schema'; +import { StrCast, Cast } from '../../../fields/Types'; import { TraceMobx } from '../../../fields/util'; import { ViewBoxBaseComponent } from '../DocComponent'; import { FieldView, FieldViewProps } from './FieldView'; import './LabelBox.scss'; -import { DocListCast } from '../../../fields/Doc'; -import { computed } from 'mobx'; +import { DocListCast, Doc } from '../../../fields/Doc'; +import { computed, action, reaction } from 'mobx'; +import { Docs } from '../../documents/Documents'; +import { List } from '../../../fields/List'; const EquationSchema = createSchema({}); @@ -22,24 +24,47 @@ const EquationDocument = makeInterface(EquationSchema, documentSchema); export class FunctionPlotBox extends ViewBoxBaseComponent<FieldViewProps, EquationDocument>(EquationDocument) { public static LayoutString(fieldKey: string) { return FieldView.LayoutString(FunctionPlotBox, fieldKey); } public static GraphCount = 0; - _ref: React.RefObject<EquationEditor> = React.createRef(); _plot: any; _plotId = ""; + _plotEle: any; constructor(props: any) { super(props); this._plotId = "graph" + FunctionPlotBox.GraphCount++; } - createGraph = (ele: HTMLDivElement) => { - let width = this.props.PanelWidth(); - let height = this.props.PanelHeight(); + componentDidMount() { + this.props.setContentView?.(this); + reaction(() => [DocListCast(this.dataDoc.data).lastElement()?.text, this.dataDoc.xRange, this.dataDoc.yRange], + () => this.createGraph()); + } + getAnchor = () => { + const anchor = Docs.Create.TextanchorDocument({ + useLinkSmallAnchor: true, + hideLinkButton: true, + annotationOn: this.rootDoc + }); + anchor.xRange = new List<number>(Array.from(this._plot.options.xAxis.domain)); + anchor.yRange = new List<number>(Array.from(this._plot.options.yAxis.domain)); + return anchor; + } + @action + scrollFocus = (doc: Doc, smooth: boolean) => { + this.dataDoc.xRange = new List<number>(Array.from(Cast(doc.xRange, listSpec("number"), Cast(this.dataDoc.xRange, listSpec("number"), [-10, 10])))); + this.dataDoc.yRange = new List<number>(Array.from(Cast(doc.yRange, listSpec("number"), Cast(this.dataDoc.xRange, listSpec("number"), [-1, 9])))); + return 0; + } + createGraph = (ele?: HTMLDivElement) => { + this._plotEle = ele || this._plotEle; + const width = this.props.PanelWidth(); + const height = this.props.PanelHeight(); const fn = StrCast(DocListCast(this.dataDoc.data).lastElement()?.text, "x^2").replace(/\\frac\{(.*)\}\{(.*)\}/, "($1/$2)"); console.log("Graphing:" + fn); try { this._plot = functionPlot({ - target: "#" + ele.id, + target: "#" + this._plotEle.id, width, height, - yAxis: { domain: [-1, 9] }, + xAxis: { domain: Cast(this.dataDoc.xRange, listSpec("number"), [-10, 10]) }, + yAxis: { domain: Cast(this.dataDoc.xRange, listSpec("number"), [-1, 9]) }, grid: true, data: [ { @@ -53,7 +78,6 @@ export class FunctionPlotBox extends ViewBoxBaseComponent<FieldViewProps, Equati } } @computed get theGraph() { - const fn = StrCast(DocListCast(this.dataDoc.data).lastElement()?.text, "x^2"); return <div id={`${this._plotId}`} ref={r => r && this.createGraph(r)} style={{ position: "absolute", width: "100%", height: "100%" }} onPointerDown={e => e.stopPropagation()} />; } diff --git a/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts b/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts index aa51a3a64..d5c77786c 100644 --- a/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts +++ b/src/client/views/nodes/formattedText/ProsemirrorExampleTransfer.ts @@ -146,7 +146,7 @@ export function buildKeymap<S extends Schema<any>>(schema: S, props: any, mapKey bind("Ctrl-m", (state: EditorState<S>, dispatch: (tx: Transaction<S>) => void) => { dispatch(state.tr.replaceSelectionWith(schema.nodes.equation.create({ fieldKey: "math" + Utils.GenerateGuid() }))); - }) + }); for (let i = 1; i <= 6; i++) { bind("Shift-Ctrl-" + i, setBlockType(schema.nodes.heading, { level: i })); |