grid.Container: columns_: add support for run-time changes #6217

neomjs · Jan 14, 2025 · 1083111 · 1083111
1 parent f2d3b08
commit 1083111
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 32 deletions.
diff --git a/src/container/Base.mjs b/src/container/Base.mjs
@@ -395,6 +395,8 @@ class Container extends Component {
             itemsRoot.cn.push(vdom)
         });
 
+        // We need to add items into the vdom
+        me.updateDepth = -1;
         me.update()
     }
 

diff --git a/src/grid/Container.mjs b/src/grid/Container.mjs
@@ -222,7 +222,7 @@ class GridContainer extends BaseContainer {
      * @protected
      */
     afterSetColumns(value, oldValue) {
-        if (Array.isArray(oldValue) && oldValue.length > 0) {
+        if (oldValue?.length > 0) {
             let me              = this,
                 {headerToolbar} = me;
 
@@ -231,7 +231,7 @@ class GridContainer extends BaseContainer {
                 headerToolbar.createItems()
             }
 
-            me.view?.createViewData(me.store.items)
+            me.view?.createViewData()
         }
     }
 

diff --git a/src/grid/header/Toolbar.mjs b/src/grid/header/Toolbar.mjs
@@ -112,10 +112,7 @@ class Toolbar extends BaseToolbar {
 
         super.createItems();
 
-        let dockLeftWidth  = 0,
-            dockRightWidth = 0,
-            {items}        = me,
-            len            = items.length,
+        let {items} = me,
             style;
 
         items.forEach((item, index) => {
@@ -128,31 +125,8 @@ class Toolbar extends BaseToolbar {
             if (item.minWidth) {style.minWidth = item.minWidth + 'px'}
             if (item.width)    {style.width    = item.width    + 'px'}
 
-            if (item.dock) {
-                NeoArray.add(item.vdom.cls, 'neo-locked');
-
-                /*if (item.dock === 'left') {
-                    style.left = dockLeftWidth + 'px'
-                }
-
-                dockLeftWidth += (item.width + 1) // todo: borders fix
-                 */
-            }
-
             item.sortable = me.sortable;
-            item.wrapperStyle = style;
-
-            // inverse loop direction
-            item = items[len - index -1];
-
-            /*if (item.dock === 'right') {
-                style = item.wrapperStyle;
-                style.right = dockRightWidth + 'px';
-
-                item.wrapperStyle = style;
-
-                dockRightWidth += (item.width + 1) // todo: borders fix
-            }*/
+            item.wrapperStyle = style
         });
 
         me.update()
@@ -172,8 +146,6 @@ class Toolbar extends BaseToolbar {
         return null
     }
 
-
-
     /**
      * @param {Boolean} silent=false
      * @returns {Promise<void>}