Small fixes to fragment hider UI

ThatOpen · Aug 13, 2023 · c87c9e6 · c87c9e6
1 parent e5997e8
commit c87c9e6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/resources/openbim-components.js b/resources/openbim-components.js
@@ -94754,6 +94754,9 @@ class AttributeQueryUI extends SimpleUIComponent {
     constructor(components) {
         super(components, `<div class="flex gap-x-2"></div>`);
         this.negate = new Dropdown(components);
+        const negateClass = this.negate.domElement.classList;
+        negateClass.remove("w-full");
+        negateClass.add("min-w-[4.5rem]");
         this.negate.label = "Sign";
         this.negate.addOption("A", "NOT A");
         this.negate.value = "A";
@@ -94840,7 +94843,7 @@ class QueryGroupUI extends SimpleUIComponent {
         }
     }
     constructor(components) {
-        super(components, `<div class="flex flex-col gap-y-3 p-3 border border-solid border-ifcjs-120 rounded-md"></div>`);
+        super(components, `<div class="flex flex-col gap-y-3 p-3 border border-solid border-ifcjs-120 bg-ifcjs-100 rounded-md"></div>`);
         this.operator = new Dropdown(components);
         this.operator.visible = false;
         this.operator.label = null;
@@ -95011,6 +95014,9 @@ class IfcPropertiesFinder extends Component {
         const groups = JSON.parse(serialized);
         this.uiElement.query.query = groups;
     }
+    deleteCache() {
+        localStorage.removeItem(this._localStorageID);
+    }
     setUI() {
         const mainButton = this.uiElement.main;
         this.uiElement.queryWindow = new FloatingWindow(this._components);
@@ -96539,6 +96545,7 @@ class FragmentHider extends Component {
             tooltip: "Visibility filters",
         });
         mainButton.onclick = () => {
+            this.hideAllFinders();
             mainWindow.visible = !mainWindow.visible;
         };
         const topButtonContainerHtml = `<div class="flex"></div>`;
@@ -96688,6 +96695,7 @@ class FragmentHider extends Component {
             found.styleCard.dispose();
             found.deleteButton.dispose();
             found.name.dispose();
+            found.finder.deleteCache();
             found.finder.dispose();
             found.visible.dispose();
             found.enabled.dispose();

diff --git a/resources/styles.css b/resources/styles.css
@@ -929,6 +929,10 @@ html {
   min-width: 300px;
 }
 
+.min-w-\[4\.5rem\]{
+  min-width: 4.5rem;
+}
+
 .max-w-xs{
   max-width: 20rem;
 }

diff --git a/src/fragments/FragmentHider/index.ts b/src/fragments/FragmentHider/index.ts
@@ -70,6 +70,7 @@ export class FragmentHider extends Component<void> implements Disposable, UI {
     });
 
     mainButton.onclick = () => {
+      this.hideAllFinders();
       mainWindow.visible = !mainWindow.visible;
     };
 
@@ -255,6 +256,7 @@ export class FragmentHider extends Component<void> implements Disposable, UI {
       found.styleCard.dispose();
       found.deleteButton.dispose();
       found.name.dispose();
+      found.finder.deleteCache();
       found.finder.dispose();
       found.visible.dispose();
       found.enabled.dispose();
@@ -264,7 +266,7 @@ export class FragmentHider extends Component<void> implements Disposable, UI {
     this.update();
   }
 
-  private hideAllFinders(excludeID: string) {
+  private hideAllFinders(excludeID?: string) {
     for (const id in this._filterCards) {
       const { finder } = this._filterCards[id];
       const window = finder.uiElement.queryWindow;

diff --git a/src/ifc/IfcPropertiesFinder/index.ts b/src/ifc/IfcPropertiesFinder/index.ts
@@ -101,6 +101,10 @@ export class IfcPropertiesFinder extends Component<null> implements UI {
     this.uiElement.query.query = groups;
   }
 
+  deleteCache() {
+    localStorage.removeItem(this._localStorageID);
+  }
+
   private setUI() {
     const mainButton = this.uiElement.main;
     this.uiElement.queryWindow = new FloatingWindow(this._components);

diff --git a/src/ifc/IfcPropertiesFinder/src/attribute-query.ts b/src/ifc/IfcPropertiesFinder/src/attribute-query.ts
@@ -58,6 +58,9 @@ export class AttributeQueryUI extends SimpleUIComponent {
     super(components, `<div class="flex gap-x-2"></div>`);
 
     this.negate = new Dropdown(components);
+    const negateClass = this.negate.domElement.classList;
+    negateClass.remove("w-full");
+    negateClass.add("min-w-[4.5rem]");
     this.negate.label = "Sign";
     this.negate.addOption("A", "NOT A");
     this.negate.value = "A";

diff --git a/src/ifc/IfcPropertiesFinder/src/query-group.ts b/src/ifc/IfcPropertiesFinder/src/query-group.ts
@@ -50,7 +50,7 @@ export class QueryGroupUI extends SimpleUIComponent {
   constructor(components: Components) {
     super(
       components,
-      `<div class="flex flex-col gap-y-3 p-3 border border-solid border-ifcjs-120 rounded-md"></div>`
+      `<div class="flex flex-col gap-y-3 p-3 border border-solid border-ifcjs-120 bg-ifcjs-100 rounded-md"></div>`
     );
 
     this.operator = new Dropdown(components);