aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2023-03-24 23:45:33 -0400
committerbobzel <zzzman@gmail.com>2023-03-24 23:45:33 -0400
commitfddac687934db4421adc16496beaee111b2d5c71 (patch)
tree153914c513f3cb395b3b30856e43950bf7643af8 /src
parentfd71eb1a130058207b45cc6a1da0dbd97f6dd4f1 (diff)
from last
Diffstat (limited to 'src')
-rw-r--r--src/client/views/collections/collectionSchema/CollectionSchemaView.tsx11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index f5d3243f4..60202a19e 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -793,7 +793,7 @@ export class CollectionSchemaView extends CollectionSubView() {
@computed get sortedDocs() {
const field = StrCast(this.layoutDoc.sortField);
const desc = BoolCast(this.layoutDoc.sortDesc);
- return !field
+ const docs = !field
? this.childDocs
: this.childDocs.sort((docA, docB) => {
const aStr = Field.toString(docA[field] as Field);
@@ -804,6 +804,7 @@ export class CollectionSchemaView extends CollectionSubView() {
if (desc) out *= -1;
return out;
});
+ return { docs };
}
sortedDocsFunc = () => this.sortedDocs;
isContentActive = () => this.props.isSelected() || this.props.isContentActive();
@@ -853,7 +854,7 @@ export class CollectionSchemaView extends CollectionSubView() {
</div>
{this._columnMenuIndex !== undefined && this.renderColumnMenu}
{this._filterColumnIndex !== undefined && this.renderFilterMenu}
- <CollectionSchemaViewDocs schema={this} childDocs={this.sortedDocsFunc} sortField={StrCast(this.layoutDoc.sortField)} sortDesc={BoolCast(this.layoutDoc.sortDesc)} />
+ <CollectionSchemaViewDocs schema={this} childDocs={this.sortedDocsFunc} />
<EditableView GetValue={returnEmptyString} SetValue={this.addNewTextDoc} placeholder={"Type ':' for commands"} contents={'+ New Node'} menuCallback={this.menuCallback} />
</div>
@@ -899,9 +900,7 @@ export class CollectionSchemaView extends CollectionSubView() {
interface CollectionSchemaViewDocsProps {
schema: CollectionSchemaView;
- childDocs: () => Doc[];
- sortField: string; // I don't know why these are needed since the childDocs function changes when the sort changes. However, for some reason that doesn't cause a re-render...
- sortDesc: boolean;
+ childDocs: () => { docs: Doc[] };
}
@observer
@@ -911,7 +910,7 @@ class CollectionSchemaViewDocs extends React.Component<CollectionSchemaViewDocsP
render() {
return (
<div className="schema-table-content">
- {this.props.childDocs().map((doc: Doc, index: number) => {
+ {this.props.childDocs().docs.map((doc: Doc, index: number) => {
const dataDoc = !doc.isTemplateDoc && !doc.isTemplateForField ? undefined : this.props.schema.props.DataDoc;
return (
<div className="schema-row-wrapper" style={{ maxHeight: CollectionSchemaView._rowHeight }}>