Display all instructions

4ian · Jan 9, 2025 · 4b2c3ab · 4b2c3ab
1 parent 65ce2bf
commit 4b2c3ab
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 11 deletions.
diff --git a/newIDE/app/src/EventsSheet/InstructionEditor/InstructionOrObjectSelector.js b/newIDE/app/src/EventsSheet/InstructionEditor/InstructionOrObjectSelector.js
@@ -94,6 +94,7 @@ const moveDeprecatedInstructionsDown = (
 };
 
 export interface TreeViewItemContent {
+  applySearch: boolean;
   getName(): string | React.Node;
   getDescription(): string | null;
   getId(): string;
@@ -103,6 +104,7 @@ export interface TreeViewItemContent {
 }
 
 export class ObjectGroupTreeViewItemContent implements TreeViewItemContent {
+  applySearch = true;
   group: gdObjectGroup;
 
   constructor(group: gdObjectGroup) {
@@ -135,17 +137,24 @@ export class ObjectGroupTreeViewItemContent implements TreeViewItemContent {
   }
 
   getThumbnail(): ?string {
-    return null;
+    return 'res/ribbon_default/objectsgroups64.png';
   }
 }
 export class ObjectGroupObjectTreeViewItemContent
   implements TreeViewItemContent {
+  applySearch = true;
   object: gdObject;
   props: ObjectTreeViewItemProps;
+  groupPrefix: string;
 
-  constructor(object: gdObject, props: ObjectTreeViewItemProps) {
+  constructor(
+    object: gdObject,
+    props: ObjectTreeViewItemProps,
+    groupPrefix: string
+  ) {
     this.object = object;
     this.props = props;
+    this.groupPrefix = groupPrefix;
   }
 
   getObject(): gdObject | null {
@@ -160,11 +169,11 @@ export class ObjectGroupObjectTreeViewItemContent
   }
 
   getId(): string {
-    return getObjectTreeViewItemId(this.object);
+    return `${this.groupPrefix}-${getObjectTreeViewItemId(this.object)}`;
   }
 
   getHtmlId(index: number): ?string {
-    return `object-item-${index}`;
+    return `${this.groupPrefix}-object-item-${index}`;
   }
 
   getDataSet(): ?HTMLDataset {
@@ -236,7 +245,8 @@ class GroupTreeViewItem implements TreeViewItem {
         return new LeafTreeViewItem(
           new ObjectGroupObjectTreeViewItemContent(
             object,
-            this.objectTreeViewItemProps
+            this.objectTreeViewItemProps,
+            this.content.getId()
           )
         );
       })
@@ -261,6 +271,7 @@ class RootTreeViewItem implements TreeViewItem {
 
 class InstructionTreeViewItemContent implements TreeViewItemContent {
   instructionMetadata: EnumeratedInstructionMetadata;
+  applySearch = false;
   constructor(instructionMetadata) {
     this.instructionMetadata = instructionMetadata;
   }
@@ -291,6 +302,7 @@ class InstructionTreeViewItemContent implements TreeViewItemContent {
 class LabelTreeViewItemContent implements TreeViewItemContent {
   id: string;
   label: string | React.Node;
+  applySearch = true;
 
   constructor(id: string, label: string | React.Node) {
     this.id = id;
@@ -605,6 +617,7 @@ export default class InstructionOrObjectSelector extends React.PureComponent<
   };
 
   getTreeViewItemName = (item: TreeViewItem) => item.content.getName();
+  shouldApplySearchToItem = (item: TreeViewItem) => item.content.applySearch;
   getTreeViewItemDescription = (item: TreeViewItem) =>
     item.content.getDescription();
   getTreeViewItemId = (item: TreeViewItem) => item.content.getId();
@@ -804,7 +817,7 @@ export default class InstructionOrObjectSelector extends React.PureComponent<
               })
             )
           : null,
-        displayedInstructionsList
+        displayedInstructionsList.length > 0
           ? new RootTreeViewItem(
               new LabelTreeViewItemContent(
                 'instructions',
@@ -889,8 +902,9 @@ export default class InstructionOrObjectSelector extends React.PureComponent<
                     <ReadOnlyTreeView
                       height={height}
                       items={getTreeViewItems(i18n)}
-                      getItemHeight={() => (isSearching ? 40 : 32)}
+                      getItemHeight={() => (isSearching ? 44 : 32)}
                       getItemName={this.getTreeViewItemName}
+                      shouldApplySearchToItem={this.shouldApplySearchToItem}
                       getItemDescription={this.getTreeViewItemDescription}
                       getItemId={this.getTreeViewItemId}
                       getItemHtmlId={this.getTreeViewItemHtmlId}

diff --git a/newIDE/app/src/EventsSheet/InstructionEditor/ObjectFolderTreeViewItemContent.js b/newIDE/app/src/EventsSheet/InstructionEditor/ObjectFolderTreeViewItemContent.js
@@ -19,6 +19,7 @@ export const getObjectFolderTreeViewItemId = (
 export class ObjectFolderTreeViewItemContent implements TreeViewItemContent {
   objectFolder: gdObjectFolderOrObject;
   props: ObjectFolderTreeViewItemProps;
+  applySearch = true;
 
   constructor(
     objectFolder: gdObjectFolderOrObject,

diff --git a/newIDE/app/src/EventsSheet/InstructionEditor/ObjectTreeViewItemContent.js b/newIDE/app/src/EventsSheet/InstructionEditor/ObjectTreeViewItemContent.js
@@ -21,6 +21,7 @@ export type ObjectTreeViewItemProps = {|
 export class ObjectTreeViewItemContent implements TreeViewItemContent {
   object: gdObjectFolderOrObject;
   props: ObjectTreeViewItemProps;
+  applySearch = true;
 
   constructor(
     object: gdObjectFolderOrObject,

diff --git a/newIDE/app/src/UI/TreeView/ReadOnlyTreeView.js b/newIDE/app/src/UI/TreeView/ReadOnlyTreeView.js
@@ -82,6 +82,7 @@ type Props<Item> = {|
   width?: number,
   items: Item[],
   getItemHeight: () => number,
+  shouldApplySearchToItem: Item => boolean,
   getItemName: Item => string | React.Node,
   getItemDescription?: Item => string,
   getItemId: Item => string,
@@ -113,6 +114,7 @@ const ReadOnlyTreeView = <Item: ItemBaseAttributes>(
     items,
     searchText,
     getItemHeight,
+    shouldApplySearchToItem,
     getItemName,
     getItemDescription,
     getItemId,
@@ -180,10 +182,13 @@ const ReadOnlyTreeView = <Item: ItemBaseAttributes>(
       }
 
       const name = getItemName(item);
-      const description = getItemDescription ? getItemDescription(item) : undefined;
+      const description = getItemDescription
+        ? getItemDescription(item)
+        : undefined;
       const dataset = getItemDataset ? getItemDataset(item) : undefined;
       const extraClass =
         animatedItemId && id === animatedItemId ? classes.animate : '';
+      const applySearch = shouldApplySearchToItem(item);
 
       /*
        * Append node to result if either:
@@ -197,7 +202,9 @@ const ReadOnlyTreeView = <Item: ItemBaseAttributes>(
         !searchText ||
         forceAllOpened ||
         forceOpen ||
-        (typeof name === 'string' && name.toLowerCase().includes(searchText)) ||
+        (!applySearch ||
+          (typeof name === 'string' &&
+            name.toLowerCase().includes(searchText))) ||
         flattenedChildren.length > 0
       ) {
         const thumbnailSrc = getItemThumbnail ? getItemThumbnail(item) : null;
@@ -241,6 +248,7 @@ const ReadOnlyTreeView = <Item: ItemBaseAttributes>(
     [
       getItemId,
       getItemChildren,
+      shouldApplySearchToItem,
       forceAllOpened,
       openedNodeIds,
       openedDuringSearchNodeIds,

diff --git a/newIDE/app/src/UI/TreeView/ReadOnlyTreeViewRow.js b/newIDE/app/src/UI/TreeView/ReadOnlyTreeViewRow.js
@@ -45,7 +45,7 @@ const TreeViewRow = <Item: ItemBaseAttributes>(props: Props<Item>) => {
 
   const onDoubleClickItem = React.useCallback(
     e => {
-      if (!node || !node.hasChildren) return;
+      if (!node || !node.hasChildren || node.disableCollapse) return;
       onOpen(node);
     },
     [node, onOpen]

diff --git a/newIDE/app/src/UI/TreeView/TreeView.module.css b/newIDE/app/src/UI/TreeView/TreeView.module.css
@@ -81,6 +81,7 @@
 
 .itemTextContainer {
   display: inline-grid;
+  gap: 2px;
 }
 
 .itemName {

diff --git a/newIDE/app/src/UI/TreeView/TreeViewRow.js b/newIDE/app/src/UI/TreeView/TreeViewRow.js
@@ -176,7 +176,7 @@ const TreeViewRow = <Item: ItemBaseAttributes>(props: Props<Item>) => {
 
   const onDoubleClickItem = React.useCallback(
     e => {
-      if (!node || !node.hasChildren) return;
+      if (!node || !node.hasChildren || node.disableCollapse) return;
       onOpen(node);
     },
     [node, onOpen]