diff options
| author | bobzel <zzzman@gmail.com> | 2020-10-21 23:59:30 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2020-10-21 23:59:30 -0400 |
| commit | a61527764cf7db2f7159730504dc70736219035d (patch) | |
| tree | ddf1b0c98da208dabecf686a41ddc48214595438 | |
| parent | fb918c91e9c7533868601c6d3e23687b5dccf1df (diff) | |
fixed dragging documents to bottom of presentation list. fixed adding to preentation list without creatinga a duplicate.
| -rw-r--r-- | src/client/views/collections/CollectionStackingView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/collections/TabDocView.tsx | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx index d490b65a8..4880d342c 100644 --- a/src/client/views/collections/CollectionStackingView.tsx +++ b/src/client/views/collections/CollectionStackingView.tsx @@ -295,7 +295,7 @@ export class CollectionStackingView extends CollectionSubView<StackingDocument, DragManager.docsBeingDragged = []; if (docs && newDocs.length) { const insertInd = dropInd === -1 ? docs.length : dropInd + dropAfter; - const offset = newDocs.reduce((off, ndoc) => this.filteredChildren.find((fdoc, i) => ndoc === fdoc && i <= insertInd) ? off + 1 : off, 0); + const offset = newDocs.reduce((off, ndoc) => this.filteredChildren.find((fdoc, i) => ndoc === fdoc && i < insertInd) ? off + 1 : off, 0); newDocs.filter(ndoc => docs.indexOf(ndoc) !== -1).forEach(ndoc => docs.splice(docs.indexOf(ndoc), 1)); docs.splice(insertInd - offset, 0, ...newDocs); } diff --git a/src/client/views/collections/TabDocView.tsx b/src/client/views/collections/TabDocView.tsx index 9c5f7c66e..41c372faa 100644 --- a/src/client/views/collections/TabDocView.tsx +++ b/src/client/views/collections/TabDocView.tsx @@ -6,7 +6,7 @@ import { clamp } from 'lodash'; import { action, computed, IReactionDisposer, observable, reaction } from "mobx"; import { observer } from "mobx-react"; import * as ReactDOM from 'react-dom'; -import { DataSym, Doc, DocListCast, Opt } from "../../../fields/Doc"; +import { DataSym, Doc, DocListCast, Opt, DocListCastAsync } from "../../../fields/Doc"; import { Id } from '../../../fields/FieldSymbols'; import { FieldId } from "../../../fields/RefField"; import { listSpec } from '../../../fields/Schema'; @@ -144,10 +144,11 @@ export class TabDocView extends React.Component<TabDocViewProps> { const fieldKey = CollectionDockingView.Instance.props.fieldKey; const sublists = DocListCast(dview[fieldKey]); const tabs = Cast(sublists[0], Doc, null); - const tabdocs = DocListCast(tabs.data); - if (!tabdocs.includes(curPres)) { - CollectionDockingView.AddSplit(curPres, "right"); - } + DocListCastAsync(tabs.data).then(tabdocs => { + if (!tabdocs?.includes(curPres)) { + CollectionDockingView.AddSplit(curPres, "right"); + } + }); DocumentManager.Instance.jumpToDocument(doc, false, undefined); } } |