From 2d2d143376e5666185735880d539ef4c71a10e8b Mon Sep 17 00:00:00 2001
From: "ala'n (Alexey Stsefanovich)" <astsefanovich@exadel.com>
Date: Wed, 15 May 2024 02:16:05 +0200
Subject: [PATCH] fix(uip-settings): fix UIPSettings does not move UIPSetting-s
 to proper container

---
 src/plugins/settings/settings.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/settings/settings.tsx b/src/plugins/settings/settings.tsx
index d144289b..8e80691b 100644
--- a/src/plugins/settings/settings.tsx
+++ b/src/plugins/settings/settings.tsx
@@ -1,15 +1,15 @@
 import React from 'jsx-dom';
 
-import {isElement} from '@exadel/esl/modules/esl-utils/dom/api';
 import {debounce} from '@exadel/esl/modules/esl-utils/async/debounce';
 import {attr, boolAttr, decorate, listen, memoize} from '@exadel/esl/modules/esl-utils/decorators';
 
 import {UIPPluginPanel} from '../../core/panel/plugin-panel';
 import {ThemeToggleIcon} from '../theme/theme-toggle.icon';
 
-import {UIPSetting} from './base-setting/base-setting';
 import {SettingsIcon} from './settings.icon';
 
+import type {UIPSetting} from './base-setting/base-setting';
+
 /**
  * Settings {@link UIPPlugin} custom element definition
  * Container for {@link UIPSetting}
@@ -57,10 +57,8 @@ export class UIPSettings extends UIPPluginPanel {
 
   @memoize()
   /** @returns HTMLElement[] - all internal items marked as settings item */
-  protected get $items(): HTMLElement[] {
-    return [...this.childNodes].filter(
-      ($el: ChildNode): $el is HTMLElement => isElement($el) && $el.hasAttribute('uip-settings-content')
-    );
+  protected get $items(): UIPSetting[] {
+    return [...this.querySelectorAll('[uip-settings-content]')] as UIPSetting[];
   }
 
   /** @returns Element[] - active internal settings items */
@@ -95,8 +93,10 @@ export class UIPSettings extends UIPPluginPanel {
 
   @decorate(debounce, 100)
   protected invalidate(): void {
+    memoize.clear(this, '$items');
     const outside = this.$items.filter((el) => el.parentElement !== this.$container);
     outside.forEach((el) => this.$container.appendChild(el));
+    this.onSettingsStateChange();
   }
 
   @listen('uip:settings:invalidate')