Skip to content

Commit bac55de

Browse files
committed
Revert fix for object tags inside Collapse
It's actually failing in Interactive View All in a different way. So we'll fix this separately.
1 parent 58c79a9 commit bac55de

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

web/libs/editor/src/tags/visual/Collapse.jsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import { getRoot, types } from "mobx-state-tree";
22
import { observer } from "mobx-react";
33
import { Collapse } from "antd";
4-
import { ff } from "@humansignal/core";
54

65
import ProcessAttrsMixin from "../../mixins/ProcessAttrs";
76
import Registry from "../../core/Registry";
87

98
import Types from "../../core/Types";
109
import Tree from "../../core/Tree";
1110
import { isSelfServe } from "../../utils/billing";
12-
import { FF_BULK_ANNOTATION, FF_DEV_3391 } from "../../utils/feature-flags";
11+
import { FF_BULK_ANNOTATION, isFF } from "../../utils/feature-flags";
1312
import { guidGenerator } from "../../utils/unique";
1413

1514
const { Panel } = Collapse;
@@ -120,17 +119,14 @@ const Model = types
120119
const CollapseModel = types.compose("CollapseModel", Model, ProcessAttrsMixin);
121120

122121
const HtxCollapse = observer(({ item }) => {
123-
const isBulkMode = ff.isActive(FF_BULK_ANNOTATION) && !isSelfServe() && item.store.hasInterface("annotation:bulk");
124-
// forceRender is needed to have proper `isReady` for nested object tags.
125-
// with Interactive View All we won't need it, because tags are rendered as usual.
126-
const extraProps = ff.isActive(FF_DEV_3391) ? {} : { forceRender: true };
122+
const isBulkMode = isFF(FF_BULK_ANNOTATION) && !isSelfServe() && item.store.hasInterface("annotation:bulk");
127123

128124
return (
129125
<Collapse bordered={item.bordered} accordion={item.accordion}>
130126
{item.children
131127
.filter((i) => i.type === "panel" && (!isBulkMode || i.isIndependent))
132128
.map((i) => (
133-
<Panel key={i._value} header={i._value} {...extraProps}>
129+
<Panel key={i._value} header={i._value}>
134130
{Tree.renderChildren(i, item.annotation)}
135131
</Panel>
136132
))}

0 commit comments

Comments
 (0)