diff options
Diffstat (limited to 'src/fields')
| -rw-r--r-- | src/fields/Doc.ts | 11 | 
1 files changed, 5 insertions, 6 deletions
| diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts index 5b3e21e34..44eb7536e 100644 --- a/src/fields/Doc.ts +++ b/src/fields/Doc.ts @@ -9,7 +9,6 @@ import { Scripting, scriptingGlobal } from "../client/util/Scripting";  import { SelectionManager } from "../client/util/SelectionManager";  import { afterDocDeserialize, autoObject, Deserializable, SerializationHelper } from "../client/util/SerializationHelper";  import { UndoManager } from "../client/util/UndoManager"; -import { CollectionDockingView } from "../client/views/collections/CollectionDockingView";  import { intersectRect, Utils } from "../Utils";  import { DateField } from "./DateField";  import { Copy, HandleUpdate, Id, OnUpdate, Parent, Self, SelfProxy, ToScriptString, ToString, Update } from "./FieldSymbols"; @@ -1059,8 +1058,7 @@ export namespace Doc {          prevLayout === "icon" && (doc.deiconifyLayout = undefined);          doc.layoutKey = deiconify || "layout";      } -    export function setDocFilterRange(target: Doc, key: string, range?: number[]) { -        const container = target ?? CollectionDockingView.Instance.props.Document; +    export function setDocFilterRange(container: Doc, key: string, range?: number[]) {          const docRangeFilters = Cast(container._docRangeFilters, listSpec("string"), []);          for (let i = 0; i < docRangeFilters.length; i += 3) {              if (docRangeFilters[i] === key) { @@ -1079,9 +1077,9 @@ export namespace Doc {      // filters document in a container collection:      // all documents with the specified value for the specified key are included/excluded       // based on the modifiers :"check", "x", undefined -    export function setDocFilter(target: Opt<Doc>, key: string, value: any, modifiers: "remove" | "match" | "check" | "x", toggle?: boolean, fieldPrefix?: string, append: boolean = true) { -        const container = target ?? CollectionDockingView.Instance.props.Document; -        const filterField = "_" + (fieldPrefix ? fieldPrefix + "-" : "") + "docFilters"; +    export function setDocFilter(container: Opt<Doc>, key: string, value: any, modifiers: "remove" | "match" | "check" | "x", toggle?: boolean, fieldSuffix?: string, append: boolean = true) { +        if (!container) return; +        const filterField = "_" + (fieldSuffix ? fieldSuffix + "-" : "") + "docFilters";          const docFilters = Cast(container[filterField], listSpec("string"), []);          runInAction(() => {              for (let i = 0; i < docFilters.length; i++) { @@ -1148,6 +1146,7 @@ export namespace Doc {              dragFactory["dragFactory-count"] = NumCast(dragFactory["dragFactory-count"]) + 1;              Doc.SetInPlace(ndoc, "title", ndoc.title + " " + NumCast(dragFactory["dragFactory-count"]).toString(), true);          } +        ndoc && (ndoc.system = false);          return ndoc;      }      export function delegateDragFactory(dragFactory: Doc) { | 
