@itfin/components 1.4.26 → 1.4.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itfin/components",
-  "version": "1.4.26",
+  "version": "1.4.28",
   "author": "Vitalii Savchuk <esvit666@gmail.com>",
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/app/App.vue

@@ -74,9 +74,12 @@ class itfApp extends Vue {
     try {
       await func();
     } catch (err) {
-      this.showError(err.message);
-      if (errFunc) {
-        errFunc(err);
+      if (err.code !== 'ERR_CANCELED') {
+        console.error(err);
+        this.showError(err.message);
+        if (errFunc) {
+          errFunc(err);
+        }
       }
     }
   }

package/src/components/checkbox/Checkbox.vue

@@ -2,7 +2,7 @@
 
   <div class="itf-checkbox form-check" :class="{ 'form-switch': this.switch, 'itf-checkbox__large': large, 'itf-checkbox__medium': medium }">
     <input class="form-check-input" ref="input" :id="id" type="checkbox" name="checkbox" v-model="isChecked" :disabled="isDisabled" />
-    <label :for="id" class="form-check-label">
+    <label :for="id" class="form-check-label w-100" :class="{ 'disabled': isDisabled }">
       <slot name="label">
         {{label}}
         <slot name="icon"></slot>

package/src/components/checkbox/RadioBox.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="itf-radio-box form-check card" :class="{ 'itf-radio__large': large, 'itf-radio__medium': medium, 'active': isChecked, 'right': right, 'left': !right }">
+  <div class="itf-radio-box form-check card" :class="{ 'disabled': disabled, 'itf-radio__large': large, 'itf-radio__medium': medium, 'active': isChecked, 'right': right, 'left': !right }">
     <input class="form-check-input" :id="id" type="radio" :name="radioName" v-model="isChecked" :value="true" :disabled="disabled" />
     <label :for="id" slot="label" class="form-check-label card-body">
 
@@ -18,6 +18,17 @@
   position: relative;
   cursor: pointer;
 
+  &:not(.disabled) {
+    cursor: pointer;
+
+    .form-check-label {
+      cursor: pointer;
+    }
+  }
+
+  .form-check-label {
+    cursor: not-allowed;
+  }
   &.left {
     padding: 0 0 0 2.5rem;
 
@@ -38,13 +49,9 @@
   &.active {
     background-color: rgba(var(--bs-primary-rgb),.1) !important;
   }
-  &:hover {
+  &:hover:not(.disabled) {
     background-color: rgba(0,0,0,.05);
   }
-
-  .form-check-label {
-    cursor: pointer;
-  }
 }
 </style>
 <script>

package/src/components/filter/FilterPanel.vue

@@ -269,7 +269,7 @@ class FilterPanel extends Vue {
           filterValue.to = payload.to;
         } else {
           filter[item.name] = payload[item.name] ? this.formatValue(item, { value: payload[item.name] }) : { isDefault: true, ...item.options.defaultValue };
-          filterValue[item.name] = payload[item.name];
+          filterValue[item.name] = payload[item.name] ?? filter[item.name].value;
         }
       }
     }

package/src/components/panels/Panel.vue

@@ -1,5 +1,6 @@
 <template>
   <div tabindex="-1" :class="{'b-panel': !nocard, 'b-panel__collapsed': collapsed, 'b-panel__active': !collapsed}">
+    <slot name="before-header"></slot>
     <div v-if="collapsed && !nocard" class="b-panel__expand" @click.stop.prevent="expandPanel">
       <itf-button v-if="closeable" icon small class="b-panel__expand_button" @click="closePanel">
         <itf-icon name="cross" />
@@ -12,19 +13,24 @@
     </div>
     <div v-if="!nocard" v-show="!collapsed" class="b-panel-header px-3 pt-3 pb-2">
       <slot name="header">
-        <div class="d-flex gap-3 align-items-center">
-          <itf-button v-if="closeable" icon default class="d-md-none" @click="closePanel">
-            <itf-icon name="chevron_left" />
+        <div class="d-flex gap-3 align-items-center" style="min-width: 0">
+          <itf-button icon default class="d-md-none open-menu-button" @click="$emit('open-menu')">
+            <itf-icon name="menu" new />
           </itf-button>
           <slot name="title">
-            <div class="b-panel__title fw-bold mb-0 h2" v-text="title"></div>
+            <div style="min-width: 0" class="b-panel__title fw-bold mb-0 h2 text-truncate" v-text="title"></div>
           </slot>
         </div>
         <div class="d-flex gap-1">
           <slot name="buttons"></slot>
-          <itf-button v-if="expandable" icon default class="b-panel__expand_button d-none d-md-block" @click="fullsizePanel">
-            <itf-icon new name="expand" />
-          </itf-button>
+          <template v-if="expandable">
+            <itf-button v-if="!isFullSize" icon default class="b-panel__expand_button d-none d-md-block" @click="fullsizePanel">
+              <itf-icon new name="expand" />
+            </itf-button>
+            <itf-button v-else icon default class="b-panel__expand_button d-none d-md-block" @click="collapsePanel">
+              <itf-icon new name="collapse" />
+            </itf-button>
+          </template>
           <itf-button v-if="closeable" icon default class="b-panel__expand_button" @click="closePanel">
             <itf-icon new name="close" />
           </itf-button>
@@ -37,10 +43,36 @@
   </div>
 </template>
 <style lang="scss">
+@keyframes bellRing {
+  0% {
+    transform: rotate(0deg);
+  }
+  10% {
+    transform: rotate(30deg);
+  }
+  20% {
+    transform: rotate(0deg);
+  }
+  30% {
+    transform: rotate(30deg);
+  }
+  40% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(0deg);
+  }
+}
+
 .b-panel {
   --b-panel-bg: var(--bs-body-bg);
   --b-panel-color: var(--bs-body-color);
   --b-panel-box-shadow: 0px 2px 6px 0px rgba(21,23,25,.05);
+  --b-panel-white: #ffffff;
+  --b-panel-info: #5981c0;
+  --b-panel-success: #10834e;
+  --b-panel-warning: #cda277;
+  --b-panel-danger: #A90B00;
 
   margin-left: 8px;
 
@@ -158,6 +190,7 @@ class Panel extends Vue {
   @Prop() panel;
   @Prop(Boolean) collapsed;
   @Prop(Boolean) closeable;
+  @Prop(Boolean) isFullSize;
   @Prop(Boolean) expandable;
   @Prop(Boolean) animate;
   @Prop(Boolean) nocard;
@@ -170,6 +203,10 @@ class Panel extends Vue {
     this.$emit('expand');
   }
 
+  collapsePanel() {
+    this.$emit('collapse');
+  }
+
   fullsizePanel() {
     this.$emit('fullsize');
   }

package/src/components/panels/PanelItemEdit.vue

@@ -1,19 +1,19 @@
 <template>
-  <div v-loading="loading" class="px-3 pt-2 h-100">
+  <div v-loading="loading" class="px-3 pt-2 h-100 d-flex flex-column">
     <itf-form
       ref="editForm"
-      class="d-flex flex-column justify-content-between h-100"
+      class="d-flex flex-column justify-content-between flex-grow-1"
       @keydown.native.shift.enter.stop.prevent="onSaveClick"
       @keydown.native.esc.stop.prevent="$emit('cancel')"
     >
       <slot></slot>
       <div class="py-3 justify-content-end d-flex align-items-center sticky-container">
         <div v-if="!hideFooter">
-          <itf-button v-tooltip.delay="'Hot key: Esc'" secondary :loading="loading" :disabled="loading" @click="$emit('cancel')">
-            <span>{{ $t('components.modal.cancel') }}</span>
+          <itf-button v-tooltip.delay="'Hot key: Esc'" secondary squircle :loading="loading" :disabled="loading" @click="$emit('cancel')">
+            <span>{{ cancelBtnText }}</span>
           </itf-button>
-          <itf-button v-tooltip.delay="'Hot key: Shift + Enter'" primary :loading="loading" :disabled="loading" @click="onSaveClick">
-            <span>{{ $t('components.modal.save') }}</span>
+          <itf-button v-tooltip.delay="'Hot key: Shift + Enter'" primary squircle :loading="loading" :disabled="loading" @click="onSaveClick">
+            <span>{{ saveBtnText }}</span>
           </itf-button>
         </div>
       </div>
@@ -51,6 +51,8 @@ import itfButton from '../button/Button.vue';
 export default class PanelItemEdit extends Vue {
   @Prop(Boolean) loading;
   @Prop(Boolean) hideFooter;
+  @Prop({ type: String, default: function() { return this.$t('components.modal.save') } }) saveBtnText;
+  @Prop({ type: String, default: function() { return this.$t('components.modal.cancel') } }) cancelBtnText;
 
   onSaveClick() {
     if (this.$refs.editForm && !this.$refs.editForm.doValidation()) {

package/src/components/panels/PanelLink.vue

@@ -5,6 +5,7 @@
 import { Vue, Component, Inject, Prop } from 'vue-property-decorator';
 import { IPanel } from './PanelList.vue';
 import {stackToHash} from "@itfin/components/src/components/panels/helpers";
+import {getRootPanelList} from "@itfin/components/src/components/panels";
 
 @Component({
   components: {
@@ -15,7 +16,6 @@ import {stackToHash} from "@itfin/components/src/components/panels/helpers";
   }
 })
 export default class PanelLink extends Vue {
-  @Inject({ default: null }) panelList;
   @Inject({ default: null }) currentPanel;
 
   @Prop(Boolean) global: boolean;
@@ -25,6 +25,7 @@ export default class PanelLink extends Vue {
   @Prop() list;
   @Prop({ type: String, default: 'active' }) activeClass: string;
   @Prop(Boolean) append: boolean;
+  @Prop(Boolean) replace: boolean;
 
   get on() {
     const handlers = {};
@@ -35,7 +36,7 @@ export default class PanelLink extends Vue {
   }
 
   get activeList() {
-    return this.list ?? this.panelList;
+    return this.list ?? getRootPanelList();
   }
 
   get isActive() {
@@ -51,6 +52,9 @@ export default class PanelLink extends Vue {
     if (!this.append) {
       stack = stack.splice(0, this.currentPanel?.index + 1);
     }
+    if (this.replace) {
+      stack = [];
+    }
     const hash = stackToHash([
       ...stack,
       {
@@ -62,13 +66,18 @@ export default class PanelLink extends Vue {
   }
 
   onClick(e) {
-    console.info(this.activeList);
+    e.preventDefault();
+    e.stopPropagation();
+    const index = this.replace ? 0 : (this.append ? undefined : this.currentPanel?.index + 1);
+    this.$emit('open', {
+      panel: this.panel,
+      payload: this.payload || {},
+      index
+    });
     if (!this.activeList) {
       return;
     }
-    e.preventDefault();
-    e.stopPropagation();
-    this.activeList.openPanel(this.panel, this.payload || {}, this.append ? undefined : this.currentPanel?.index + 1);
+    this.activeList.openPanel(this.panel, this.payload || {}, index);
   }
 }
 </script>

package/src/components/panels/PanelList.vue

@@ -17,14 +17,20 @@
           :icon="panel.icon"
           :payload="panel.payload"
           :expandable="panelsStack.length > 1"
+          :isFullSize="isFullSize"
           :collapsed="panel.isCollapsed"
           :closeable="panel.isCloseable"
           :animate="panel.isAnimate"
           @open="openPanel($event[0], $event[1], n + 1)"
           @expand="expandPanel(panel)"
           @fullsize="fullsizePanel(panel)"
+          @collapse="collapsePanel(panel)"
           @close="closePanel(panel)"
+          @open-menu="$emit('open-menu', panel.type, panel.payload)"
         >
+          <template #before-header>
+            <slot name="before-header" :panel="panel" :index="n" :payload="panel.payload"></slot>
+          </template>
           <slot
             :name="panel.type"
             :panel="panel"
@@ -34,9 +40,9 @@
             :close="() => closePanel(panel)"
             :expand="() => expandPanel(panel)"
             :fullsize="() => fullsizePanel(panel)">
-            <component :is="panels[panel.type].default || panels[panel.type]" :panel="panel" :payload="panel.payload" />
+            <component v-if="panel.components.default" :is="panel.components.default" :panel="panel" :payload="panel.payload" />
           </slot>
-          <template v-if="$scopedSlots[`${panel.type}.title`] || panels[panel.type].title" #title>
+          <template v-if="$scopedSlots[`${panel.type}.title`] || panel.components.title" #title>
             <slot
               :name="`${panel.type}.title`"
               :panel="panel"
@@ -46,10 +52,10 @@
               :close="() => closePanel(panel)"
               :expand="() => expandPanel(panel)"
               :fullsize="() => fullsizePanel(panel)">
-              <component v-if="panels[panel.type].title" :is="panels[panel.type].title" :panel="panel" :payload="panel.payload" />
+              <component v-if="panel.components.title" :is="panel.components.title" :panel="panel" :payload="panel.payload" />
             </slot>
           </template>
-          <template v-if="$scopedSlots[`${panel.type}.buttons`] || panels[panel.type].buttons" #buttons>
+          <template v-if="$scopedSlots[`${panel.type}.buttons`] || panel.components.buttons" #buttons>
             <slot
               :name="`${panel.type}.buttons`"
               :panel="panel"
@@ -59,10 +65,10 @@
               :close="() => closePanel(panel)"
               :expand="() => expandPanel(panel)"
               :fullsize="() => fullsizePanel(panel)">
-              <component v-if="panels[panel.type].buttons" :is="panels[panel.type].buttons" :panel="panel" :payload="panel.payload" />
+              <component v-if="panel.components.buttons" :is="panel.components.buttons" :panel="panel" :payload="panel.payload" />
             </slot>
           </template>
-          <template v-if="$scopedSlots[`${panel.type}.header`] || panels[panel.type].header" #header>
+          <template v-if="$scopedSlots[`${panel.type}.header`] || panel.components.header" #header>
             <slot
               :name="`${panel.type}.header`"
               :panel="panel"
@@ -72,7 +78,7 @@
               :close="() => closePanel(panel)"
               :expand="() => expandPanel(panel)"
               :fullsize="() => fullsizePanel(panel)">
-              <component v-if="panels[panel.type].header" :is="panels[panel.type].header" :panel="panel" :payload="panel.payload" />
+              <component v-if="panel.components.header" :is="panel.components.header" :panel="panel" :payload="panel.payload" />
             </slot>
           </template>
         </panel>
@@ -148,7 +154,6 @@ $double-an-time: $an-time * 2;
     //transition: opacity $an-time linear;
   }
 }
-
 //.slide-enter-active > div {
 //  opacity: 0;
 //}
@@ -159,8 +164,10 @@ $double-an-time: $an-time * 2;
 </style>
 <script lang="ts">
 import { Vue, Component, Prop } from 'vue-property-decorator';
-import Panel from './Panel';
-import {hashToStack, stackToHash} from "./helpers";
+import itfIcon from '../icon/Icon.vue';
+import Panel from './Panel.vue';
+import {hashToStack, stackToHash} from "@itfin/components/src/components/panels/helpers";
+import {emitGlobalEvent, setRootPanelList} from "@itfin/components/src/components/panels";
 
 interface VisualOptions {
   title: string;
@@ -195,6 +202,7 @@ export interface IPanel {
 
 @Component({
   components: {
+    itfIcon,
     Panel
   },
   directives: {
@@ -208,12 +216,15 @@ export interface IPanel {
 export default class PanelList extends Vue {
   @Prop() firstPanel: IPanel;
   @Prop() panels: Record<string, Component>;
+  @Prop({ default: () => {} }) searchPanel: (type: string) => boolean;
+  @Prop({ type: String, default: 'path' }) routeType: string;
 
   panelsStack:IPanel[] = [];
 
   nextId:number = 0;
 
   created() {
+    setRootPanelList(this);
     if (this.firstPanel) {
       this.internalOpenPanel(this.firstPanel.type, this.firstPanel.payload);
     }
@@ -267,18 +278,30 @@ export default class PanelList extends Vue {
     this.panelsStack = newStack;
   }
 
-  internalOpenPanel(type: string, payload: any = {}, openIndex?: number, noEvents = false) {
-    if (!this.panels[type]) {
-      return;
+  async internalOpenPanel(type: string, payload: any = {}, openIndex?: number, noEvents = false) {
+    let panel = this.panels[type];
+    if (!panel) {
+      panel = await this.searchPanel(type, this.panels);
+      if (!panel) {
+        console.error(`Panel type "${type}" not found`);
+        return;
+      }
+      panel.type = type;
     }
-    if (typeof this.panels[type].caption !== 'function') {
+    if (typeof panel.caption !== 'function') {
       throw new Error('Panel component must have a "caption" function');
     }
     const newPanel:any = {
       id: this.nextId++,
-      nocard: this.panels[type].nocard,
-      title: this.panels[type].caption(this.$t.bind(this), payload),
-      icon: this.panels[type].icon ? this.panels[type].icon(this.$t.bind(this), payload) : null,
+      nocard: panel.nocard,
+      title: panel.caption(this.$t.bind(this), payload),
+      icon: panel.icon ? panel.icon(this.$t.bind(this), payload) : null,
+      components: {
+        default: panel.default ?? undefined,
+        buttons: panel.buttons ?? undefined,
+        header: panel.header ?? undefined,
+        title: panel.title ?? undefined,
+      },
       type,
       payload,
       isCollapsed: false,
@@ -289,7 +312,7 @@ export default class PanelList extends Vue {
       newPanel.isCloseable = false;
     }
     let newStack = [...this.panelsStack];
-    if (this.panels[type].permanentExpanded && newStack.length) {
+    if (panel.permanentExpanded && newStack.length) {
       for (const panel of newStack) {
         panel.isCollapsed = true;
       }
@@ -299,25 +322,32 @@ export default class PanelList extends Vue {
       isAnimation = newStack.length === openIndex;
       newStack = newStack.slice(0, openIndex);
     }
+    if (newStack.length > 0 && !newStack.find(p => !p.isCollapsed)) {
+      // якщо немає відкритих панелей, то перша панель має бути розгорнута
+      newStack[0].isCollapsed = false;
+    }
     this.panelsStack = newStack;
     return new Promise(res => {
       this.$nextTick(() => { // щоб панелі змінювались при редагуванні
         const n = newStack.length;
         newPanel.isAnimate = isAnimation;
-        newPanel.permanentExpanded = !!this.panels[type].permanentExpanded;
+        newPanel.permanentExpanded = !!panel.permanentExpanded;
         newPanel.emit = (event, ...args) => this.emitEvent(event, ...args);
-        newPanel.open = (type, payload) => this.openPanel(type, payload, n + 1);
+        newPanel.open = (type, payload, index?:number) => this.openPanel(type, payload, index ?? n + 1);
         newPanel.close = () => this.closePanel(newPanel);
         newPanel.expand = () => this.expandPanel(newPanel);
         newPanel.getTitle = () => newPanel.title;
         newPanel.getIcon = () => newPanel.icon;
-        newPanel.setTitle = (title: string) => { newPanel.title = title; };
+        newPanel.setTitle = (title: string) => { newPanel.title = title; this.updateTitle() };
         newPanel.setIcon = (icon: string) => { newPanel.icon = icon; };
-        newPanel.on = (eventName, func: (event: string, ...args: any[]) => any) => {
-          if (!newPanel.__events[eventName]) {
-            newPanel.__events[eventName] = [];
+        newPanel.on = (eventName: string|string[], func: (event: string, ...args: any[]) => any) => {
+          const eventNames = Array.isArray(eventName) ? eventName : [eventName];
+          for (const evName of eventNames) {
+            if (!newPanel.__events[evName]) {
+              newPanel.__events[evName] = [];
+            }
+            newPanel.__events[evName].push(func);
           }
-          newPanel.__events[eventName].push(func);
         };
         newPanel.off = (eventName, func: (event: string, ...args: any[]) => any) => {
           if (newPanel.__events[eventName]) {
@@ -337,9 +367,7 @@ export default class PanelList extends Vue {
         newPanel.getPayload = () => newPanel.payload;
         newPanel.setPayload = (value: any) => {
           newPanel.payload = value;
-          newPanel.title = this.panels[type].caption(this.$t.bind(this), value);
-          newPanel.icon = this.panels[type].icon ? this.panels[type].icon(this.$t.bind(this), payload) : null,
-            this.setPanelHash()
+          this.setPanelHash();
         }
         newStack.push(newPanel);
         this.panelsStack = newStack;
@@ -353,12 +381,19 @@ export default class PanelList extends Vue {
     });
   }
 
+  updateTitle() {
+    const titles = this.panelsStack.map(p => p.getTitle()).filter(Boolean).reverse();
+    this.$root.$options.head.titleChunk = titles.join(' / ');
+    this.$meta().refresh();
+  }
+
   async openPanel(type: string, payload: any, openIndex?: number) {
     await this.internalOpenPanel(type, payload, openIndex);
-    this.setPanelHash()
+    this.setPanelHash();
   }
 
   emitEvent(event: string, ...args: any[]) {
+    emitGlobalEvent(event, ...args);
     for (const panel of this.panelsStack) {
       if (panel.__events[event]) {
         for (const func of panel.__events[event]) {
@@ -388,12 +423,40 @@ export default class PanelList extends Vue {
   fullsizePanel(panel: IPanel) {
     const newStack = [...this.panelsStack];
     for (const p of newStack) {
+      p.isLastOpened = !p.isCollapsed && p !== panel;
       p.isCollapsed = p !== panel;
     }
     this.panelsStack = newStack;
     this.setPanelHash();
   }
 
+  get isFullSize() {
+    return this.panelsStack.filter(p => !p.isCollapsed).length === 1;
+  }
+
+  expandPanel(panel: IPanel) {
+    const newStack = [...this.panelsStack];
+    const index = newStack.findIndex(p => p.id === panel.id);
+    newStack[index].isCollapsed = false;
+    this.panelsStack = newStack;
+    this.ensureOnlyTwoOpenPanels(panel.id);
+    this.setPanelHash();
+  }
+
+  collapsePanel(panel: IPanel) {
+    const newStack = [...this.panelsStack];
+    const currenctIndex = newStack.findIndex(p => p.id === panel.id);
+    const lastOpenedIndex = newStack.findIndex(p => p.isLastOpened);
+    if (lastOpenedIndex !== -1) { // якщо зебрежена остання відкрита панель
+      newStack[lastOpenedIndex].isCollapsed = false
+    } else if (newStack[currenctIndex-1]) { // якщо після оновлення сторінки відсутнє значення "остання відкрита", то відкриваємо ту, що зліва
+      newStack[currenctIndex-1].isCollapsed = false;
+    }
+    this.panelsStack = newStack;
+    this.ensureOnlyTwoOpenPanels(panel.id);
+    this.setPanelHash();
+  }
+
   getPanels(type) {
     return this.panelsStack.filter(panel => panel.type === type);
   }
@@ -403,14 +466,19 @@ export default class PanelList extends Vue {
   }
 
   setPanelHash() {
-    const hash = stackToHash(this.panelsStack).replace(/^#/, '');
-    this.$router.push({ hash });
+    const hash = stackToHash(this.panelsStack, this.routeType === 'path').replace(/^#/, '');
+    if (this.routeType === 'path') {
+      this.$router.push({ path: `/${hash}` });
+    } else {
+      this.$router.push({ hash });
+    }
+    this.updateTitle();
   }
 
   async parsePanelHash() {
-    const {hash} = location;
+    const hash = this.routeType === 'path' ? location.pathname : location.hash;
     if (hash) {
-      const panels = hashToStack(hash);
+      const panels = hashToStack(hash, this.routeType === 'path');
       const newStack = [];
       this.panelsStack = [];
       for (const panelIndex in panels) {
@@ -431,6 +499,7 @@ export default class PanelList extends Vue {
       }
       this.panelsStack = newStack;
       this.emitEvent('panels.changed', this.panelsStack);
+      this.updateTitle();
     }
   }
 

package/src/components/panels/helpers.ts

@@ -1,33 +1,51 @@
+import JSON5 from 'json5'
+import {isPathType} from "./index";
+
 export interface IPanel {
   type: string;
   payload?: any;
   isCollapsed?: boolean;
 }
 
+const COLLAPSE_SYMBOL = '~'
+const PARAMS_SYMBOL = ';'
+
 export function stackToHash(stack: IPanel[]) {
   const hash = stack.map(panel => {
-    return `${panel.type}${panel.isCollapsed ? '' : '!'}=${JSON.stringify(panel.payload || {})}`;
-  }).join('&');
-  return `#${hash}`;
+    let json = JSON5.stringify(panel.payload || {});
+    json = json.substring(1, json.length - 1); // Remove the outer {}
+    return `${panel.type}${panel.isCollapsed ? COLLAPSE_SYMBOL : ''}${json ? PARAMS_SYMBOL : ''}${json}`;
+  }).join(isPathType() ? '/' : '&');
+  return isPathType() ? `/${hash}` : `#${hash}`;
 }
 
 
 export function hashToStack(hash: string|undefined): IPanel[] {
   let stack:IPanel[] = [];
-  if (hash) {
-    const str = hash.replace(/^#/, '');
-
-    stack = str.split('&').map(item => {
-      const [type, payload] = item.split('=');
-      const isCollapsed = !type.includes('!');
+  const str = hash.replace(isPathType() ? /^\// : /^#/, '');
+  if (str) {
+    stack = str.split(isPathType() ? '/' : '&').map(item => {
+      if (!item.includes(PARAMS_SYMBOL)) {
+        return { type: item.replace(COLLAPSE_SYMBOL, ''), isCollapsed: item.includes(COLLAPSE_SYMBOL), payload: {} };
+      }
+      const [type, payload] = item.split(PARAMS_SYMBOL);
+      const isCollapsed = type.includes(COLLAPSE_SYMBOL);
       let payloadObj:any = {};
       try {
-        payloadObj = JSON.parse(decodeURIComponent(payload));
+        let json = decodeURIComponent(payload);
+        if (!json.startsWith('{')) {
+          json = `{${json}`; // Ensure it starts with a '{' to be valid JSON
+        }
+        if (!json.endsWith('}')) {
+          json += '}'; // Ensure it ends with a '}' to be valid JSON
+        }
+        payloadObj = JSON5.parse(json);
       } catch (e) {
         // ignore
+        console.warn(`Error parsing payload for type ${type}:`, payload, e);
       }
       return {
-        type: type.replace('!', ''),
+        type: type.replace(COLLAPSE_SYMBOL, ''),
         isCollapsed,
         payload: payloadObj
       };