@shoper/phoenix_design_system 0.25.0-8 → 0.25.0

package/build/cjs/packages/phoenix/src/components/dropdown/dropdown.js

@@ -11,6 +11,7 @@ var portal_constants = require('../portal/portal_constants.js');
 var litHtml = require('lit-html');
 var backdrop_controller = require('../backdrop/controller/backdrop_controller.js');
 var decorators_js = require('@lit/reactive-element/decorators.js');
+var keystrokes_controller = require('../../controllers/keystrokes_controller/keystrokes_controller.js');
 var global_constants = require('../../global_constants.js');
 var dropdown_constants = require('./dropdown_constants.js');
 var relative_position_controller_constants = require('../../controllers/relative_position_controller/relative_position_controller_constants.js');
@@ -21,7 +22,7 @@ var relative_position_controller = require('../../controllers/relative_position_
 var HDropdown_1;
 exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_element.PhoenixLightLitElement {
     constructor() {
-        super(...arguments);
+        super();
         this.opened = false;
         this.direction = relative_position_controller_constants.DIRECTIONS.bottomCenter;
         this.toggleOnHover = false;
@@ -55,13 +56,13 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
                     }, 0);
                     const transitionDuration = parseFloat(getComputedStyle(this.$dropdownContent || this).transitionDuration) * 1000;
                     setTimeout(() => {
-                        var _a, _b, _c;
+                        var _a, _b;
                         this._dispatchShowDropdownEvent();
                         (_a = this.$dropdownContent) === null || _a === void 0 ? void 0 : _a.classList.remove(`${dropdown_constants.DROPDOWN_CONTENT_SHOW}-${this.transition}-start`, `${dropdown_constants.DROPDOWN_CONTENT_SHOW}-${this.transition}-end`);
                         this._toggleScroll();
                         if (!this._lastFocusableElement)
                             this._lastFocusableElement = (_b = this.$dropdownContent) === null || _b === void 0 ? void 0 : _b.lastElementChild;
-                        this._focusOnNextSibling((_c = this.$dropdownContent) === null || _c === void 0 ? void 0 : _c.firstElementChild);
+                        utilities.UiDomUtils.setFocusToFirstFocusableElementInContainer(this.$dropdownContent);
                         resolve();
                     }, transitionDuration);
                 });
@@ -132,20 +133,35 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
                 return;
             await this.hide();
         };
-        this._handleFocusWithinDropdown = async (ev) => {
+        this._handleForwardFocus = async (ev) => {
+            const $focusableElementsWithinDropdownContent = utilities.UiDomUtils.getFocusableElements(this.$dropdownContent);
+            const doesNotHaveFocusableElementsInsideContent = $focusableElementsWithinDropdownContent.length <= 0 && this.opened;
+            const isActiveElementLastFocusableElement = document.activeElement === this._lastFocusableElement;
+            if (doesNotHaveFocusableElementsInsideContent || isActiveElementLastFocusableElement)
+                this._focusOnNextElementAfterToggler(ev);
+        };
+        this._focusOnNextElementAfterToggler = async (ev) => {
+            ev.preventDefault();
+            const $focusableElements = utilities.UiDomUtils.getFocusableElements(document.body);
+            const indexOfDropdownToggler = $focusableElements.indexOf(this.$dropdownToggler);
+            const $nextElementToFocus = $focusableElements.find((currentElement, index) => {
+                if (index > indexOfDropdownToggler && !currentElement.closest(`${dropdown_constants.DROPDOWN_TOGGLER_NAME}[name="${this.name}"]`))
+                    return currentElement;
+                return null;
+            });
+            if ($nextElementToFocus)
+                $nextElementToFocus.focus();
+            await this._hideDropdownsSequentially();
+            await this.hide();
+        };
+        this._handleBackwardFocus = async (ev) => {
             var _a;
-            const hasTabBeenPressed = ev.key.toLowerCase() === 'tab';
-            if (hasTabBeenPressed && document.activeElement === this._lastFocusableElement) {
-                ev.preventDefault();
-                this._focusOnNextSibling(this.nextElementSibling || this);
-                await this._hideDropdownsSequentially();
-            }
             const $firstFocusableElement = this.$dropdownContent && utilities.UiDomUtils.getFocusableElement(this.$dropdownContent);
-            if (hasTabBeenPressed && ev.shiftKey && document.activeElement === $firstFocusableElement) {
-                ev.preventDefault();
-                (_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.focus();
-                await this._hideDropdownsSequentially();
-            }
+            if (document.activeElement !== $firstFocusableElement)
+                return;
+            ev.preventDefault();
+            (_a = this.$dropdownToggler) === null || _a === void 0 ? void 0 : _a.focus();
+            await this._hideDropdownsSequentially();
         };
         this._hoverToggle = async (ev) => {
             if (window.innerWidth < global_constants.BREAKPOINTS.xs)
@@ -169,6 +185,18 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
                     : this._positionController.position();
             });
         };
+        new keystrokes_controller.KeystrokesController({
+            host: this,
+            target: document.body,
+            keys: ['tab'],
+            callback: this._handleForwardFocus
+        });
+        new keystrokes_controller.KeystrokesController({
+            host: this,
+            target: document.body,
+            keys: [['shift', 'tab']],
+            callback: this._handleBackwardFocus
+        });
     }
     connectedCallback() {
         var _a;
@@ -225,7 +253,6 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
         document.addEventListener(dropdown_constants.DROPDOWN_EVENTS.hide, this.hide);
         window.addEventListener('resize', this._observeScrollToggling);
         document.addEventListener('keydown', this._closeDropdownOnEscape);
-        document.addEventListener('keydown', this._handleFocusWithinDropdown);
         if (this.toggleOnHover)
             document.addEventListener('mouseover', this._hoverToggle);
     }
@@ -245,17 +272,6 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
             (_b = this.$dropdownContent) === null || _b === void 0 ? void 0 : _b.classList.add(global_constants.SCROLLABLE_CLASS_NAME);
         }
     }
-    _focusOnNextSibling(el) {
-        el.focus();
-        if (el === document.activeElement)
-            return;
-        if (el.firstElementChild) {
-            this._focusOnNextSibling(el.firstElementChild);
-            return;
-        }
-        if (el.nextElementSibling)
-            this._focusOnNextSibling(el.nextElementSibling);
-    }
     _isHoveredWithinDropdown(element) {
         var _a;
         if (element === this)
@@ -287,7 +303,6 @@ exports.HDropdown = HDropdown_1 = class HDropdown extends phoenix_light_lit_elem
         window.removeEventListener('resize', this._observeScrollToggling);
         document.removeEventListener('keydown', this._closeDropdownOnEscape);
         document.removeEventListener(dropdown_constants.DROPDOWN_EVENTS.hide, this.hide);
-        document.removeEventListener('keydown', this._handleFocusWithinDropdown);
         if (this.toggleOnHover)
             document.removeEventListener('mouseover', this._hoverToggle);
         if (this.opened) {
@@ -334,6 +349,7 @@ tslib_es6.__decorate([
     tslib_es6.__metadata("design:type", Object)
 ], exports.HDropdown.prototype, "_lastFocusableElement", void 0);
 exports.HDropdown = HDropdown_1 = tslib_es6.__decorate([
-    phoenix_custom_element.phoenixCustomElement('h-dropdown')
+    phoenix_custom_element.phoenixCustomElement('h-dropdown'),
+    tslib_es6.__metadata("design:paramtypes", [])
 ], exports.HDropdown);
 //# sourceMappingURL=dropdown.js.map

package/build/cjs/packages/phoenix/src/components/dropdown/dropdown.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,uBAAuB,4CAAgD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,uBAAuB,4CAAgD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/form/color_swatches_control/color_swatches_control.js

@@ -37,9 +37,11 @@ exports.HColorSwatchesControl = class HColorSwatchesControl extends phoenix_ligh
     }
     render() {
         return lit.html `
-            <h-input controlName="${this.name}">
-                <h-input-control type="${input_constants.INPUT_CONTROL_TYPES.hidden}" value="${this.selectedColors}"></h-input-control>
-            </h-input>
+            <h-input-control
+                controlName="${this.controlName}"
+                type="${input_constants.INPUT_CONTROL_TYPES.hidden}"
+                value="${this.selectedColors}"
+            ></h-input-control>
         `;
     }
 };
@@ -50,7 +52,7 @@ tslib_es6.__decorate([
 tslib_es6.__decorate([
     decorators.property({ type: String }),
     tslib_es6.__metadata("design:type", String)
-], exports.HColorSwatchesControl.prototype, "name", void 0);
+], exports.HColorSwatchesControl.prototype, "controlName", void 0);
 tslib_es6.__decorate([
     decorators.property({ type: Boolean }),
     tslib_es6.__metadata("design:type", Boolean)

package/build/cjs/packages/phoenix/src/components/form/color_swatches_control/color_swatches_control.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA,oBAAoB,gDAAoD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA,oBAAoB,gDAAoD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/form/input/input_icon.js

@@ -10,21 +10,26 @@ var phoenix_custom_element = require('../../../core/decorators/phoenix_custom_el
 var input_constants = require('./input_constants.js');
 var icon_constants = require('../../icon/icon_constants.js');
 
-exports.HInputIcon = class HInputIcon extends phoenix_light_lit_element.PhoenixLightLitElement {
+var HInputIcon_1;
+exports.HInputIcon = HInputIcon_1 = class HInputIcon extends phoenix_light_lit_element.PhoenixLightLitElement {
     connectedCallback() {
         super.connectedCallback();
         this.classList.add(input_constants.INPUT_CONTROL_CSS_CLASSES.inputIcon, icon_constants.ICON_CSS_CLASSES.icon);
     }
     render() {
         super.render();
-        return lit.html ` <h-icon icon-name=${this.iconName}></h-icon> `;
+        return lit.html `
+            <svg>
+                <use xlink:href="${HInputIcon_1.src}#${this.iconName}"></use>
+            </svg>
+        `;
     }
 };
 tslib_es6.__decorate([
-    decorators.property({ type: String, attribute: 'icon-name' }),
+    decorators.property({ type: String }),
     tslib_es6.__metadata("design:type", String)
 ], exports.HInputIcon.prototype, "iconName", void 0);
-exports.HInputIcon = tslib_es6.__decorate([
+exports.HInputIcon = HInputIcon_1 = tslib_es6.__decorate([
     phoenix_custom_element.phoenixCustomElement('h-input-icon')
 ], exports.HInputIcon);
 //# sourceMappingURL=input_icon.js.map

package/build/cjs/packages/phoenix/src/components/form/input/input_icon.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/icon/icon_constants.js

@@ -2,22 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const iconBaseClass = 'icon';
 const ICON_CSS_CLASSES = {
-    icon: iconBaseClass,
-    iconFilled: `${iconBaseClass}_filled`,
-    iconNoStroke: `${iconBaseClass}_no-stroke`,
-    iconSizeL: `${iconBaseClass}_l`,
-    iconSizeXl: `${iconBaseClass}_xl`,
-    iconSizeXxl: `${iconBaseClass}_xxl`,
-    iconClickable: `${iconBaseClass}_clickable`
-};
-const ICON_SIZES_CSS_CLASS_MAP = {
-    l: ICON_CSS_CLASSES.iconSizeL,
-    xl: ICON_CSS_CLASSES.iconSizeXl,
-    xxl: ICON_CSS_CLASSES.iconSizeXxl
+    icon: 'icon'
 };
 
 exports.ICON_CSS_CLASSES = ICON_CSS_CLASSES;
-exports.ICON_SIZES_CSS_CLASS_MAP = ICON_SIZES_CSS_CLASS_MAP;
 //# sourceMappingURL=icon_constants.js.map

package/build/cjs/packages/phoenix/src/components/icon/icon_constants.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/messages/base_message.js

@@ -21,9 +21,9 @@ class BaseMessage extends phoenix_light_lit_element.PhoenixLightLitElement {
         this.direction = relative_position_controller_constants.DIRECTIONS.topCenter;
         this.offset = base_message_constants.DEFAULT_MESSAGE_OFFSET;
         this._setupEventListeners = () => {
-            this.addEventListener('mouseenter', this._open);
-            this.addEventListener('mouseleave', this._close);
-            this.addEventListener('focus', this._open);
+            this.addEventListener('mouseenter', this.open);
+            this.addEventListener('mouseleave', this.close);
+            this.addEventListener('focus', this.open);
         };
         this._positionMessage = () => {
             requestAnimationFrame(() => {
@@ -31,7 +31,7 @@ class BaseMessage extends phoenix_light_lit_element.PhoenixLightLitElement {
                 (_a = this._$messageContent) === null || _a === void 0 ? void 0 : _a.setAttribute('direction', this._positionController.position());
             });
         };
-        this._open = () => {
+        this.open = () => {
             this._tooltipOpenTime = Date.now();
             clearTimeout(this._closeTimeout);
             this._openTimeout = setTimeout(() => {
@@ -40,7 +40,7 @@ class BaseMessage extends phoenix_light_lit_element.PhoenixLightLitElement {
                 this.opened = true;
             }, base_message_constants.MESSAGE_SHOW_DELAY_IN_MS);
         };
-        this._close = () => {
+        this.close = () => {
             this._shouldDelayClosing = Date.now() - this._tooltipOpenTime > base_message_constants.MESSAGE_TIME_TO_DELAY_CLOSING_IN_MS;
             clearTimeout(this._openTimeout);
             if (!this.opened)
@@ -62,31 +62,46 @@ class BaseMessage extends phoenix_light_lit_element.PhoenixLightLitElement {
         this._handleFocusWithinMessage = (ev) => {
             var _a;
             if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.closest(`.${this._messageComponentName}`)) !== this)
-                this._close();
-            if (!document.activeElement)
+                this.close();
+            if (!document.activeElement || ev.shiftKey)
                 return;
             const $focusableElements = utilities.UiDomUtils.getFocusableElements(this);
             const activeElementIndex = $focusableElements.indexOf(document.activeElement);
-            // jeśli jest przedostatni, to następnym elementem jest sentinel
-            const isPenultimate = activeElementIndex + 1 === $focusableElements.length - 1;
-            if (!isPenultimate)
+            const isLastFocusableChild = activeElementIndex === $focusableElements.length - 1;
+            if (!isLastFocusableChild)
                 return;
-            this._close();
-            ev.preventDefault();
-            const $focusableParentElements = utilities.UiDomUtils.getFocusableElements(document.body);
-            const sentinelIndex = $focusableParentElements.indexOf(document.activeElement) + 1;
-            $focusableParentElements[sentinelIndex + 1].focus();
+            this.close();
+        };
+        this._handleReverseTab = () => {
+            const $focusableElements = utilities.UiDomUtils.getFocusableElements(document.body);
+            const activeElement = document.activeElement;
+            const indexOfCurrentlyFocusedElement = $focusableElements.indexOf(activeElement);
+            const $previousElement = $focusableElements[indexOfCurrentlyFocusedElement - 1];
+            const $previousElementMessageParent = $previousElement === null || $previousElement === void 0 ? void 0 : $previousElement.closest(`h-${this._messageComponentName}`);
+            if ($previousElementMessageParent === this)
+                return;
+            if ($previousElementMessageParent)
+                $previousElementMessageParent.open();
+            if (this._isBaseMessage(activeElement))
+                activeElement.close();
         };
         this._clickOutsideController = new click_outside_controller.ClickOutsideController({
             host: this,
             container: this,
-            action: this._close
+            action: this.close
         });
         new keystrokes_controller.KeystrokesController({
             host: this,
             keys: ['tab'],
+            target: this,
             callback: this._handleFocusWithinMessage
         });
+        new keystrokes_controller.KeystrokesController({
+            host: this,
+            keys: [['shift', 'tab']],
+            target: document.body,
+            callback: this._handleReverseTab
+        });
     }
     connectedCallback(messageComponentName = '') {
         super.connectedCallback();
@@ -113,6 +128,11 @@ class BaseMessage extends phoenix_light_lit_element.PhoenixLightLitElement {
         $portalTarget.setAttribute(portal_constants.PORTAL_TARGET_NAME_PROP, base_message_constants.DEFAULT_MESSAGE_PORTAL_NAME);
         document.body.appendChild($portalTarget);
     }
+    _isBaseMessage($element) {
+        if (base_message_constants.MESSAGE_ELEMENTS.includes($element.localName))
+            return true;
+        return false;
+    }
 }
 tslib_es6.__decorate([
     decorators.property({ type: Boolean, reflect: true }),

package/build/cjs/packages/phoenix/src/components/messages/base_message.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/messages/base_message_constants.js

@@ -9,6 +9,7 @@ const DEFAULT_MESSAGE_PORTAL_NAME = 'message-portal';
 const MESSAGE_CONTENT_SLOT_NAME = 'message-content';
 const MESSAGE_REMOVED_CLASS_NAME = `removed`;
 const DEFAULT_MESSAGE_OFFSET = 10;
+const MESSAGE_ELEMENTS = [tooltip_constants.TOOLTIP_ELEMENT_NAME, hint_constants.HINT_ELEMENT_NAME];
 const MESSAGE_CONTENT_ELEMENTS = [tooltip_constants.TOOLTIP_CONTENT_ELEMENT_NAME, hint_constants.HINT_CONTENT_ELEMENT_NAME];
 const MESSAGE_SHOW_DELAY_IN_MS = 100;
 const MESSAGE_TIME_TO_DELAY_CLOSING_IN_MS = 500;
@@ -19,6 +20,7 @@ exports.DEFAULT_MESSAGE_PORTAL_NAME = DEFAULT_MESSAGE_PORTAL_NAME;
 exports.MESSAGE_CLOSE_DELAY_IN_MS = MESSAGE_CLOSE_DELAY_IN_MS;
 exports.MESSAGE_CONTENT_ELEMENTS = MESSAGE_CONTENT_ELEMENTS;
 exports.MESSAGE_CONTENT_SLOT_NAME = MESSAGE_CONTENT_SLOT_NAME;
+exports.MESSAGE_ELEMENTS = MESSAGE_ELEMENTS;
 exports.MESSAGE_REMOVED_CLASS_NAME = MESSAGE_REMOVED_CLASS_NAME;
 exports.MESSAGE_SHOW_DELAY_IN_MS = MESSAGE_SHOW_DELAY_IN_MS;
 exports.MESSAGE_TIME_TO_DELAY_CLOSING_IN_MS = MESSAGE_TIME_TO_DELAY_CLOSING_IN_MS;

package/build/cjs/packages/phoenix/src/components/messages/base_message_constants.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/messages/hints/hint.js

@@ -24,7 +24,6 @@ exports.HHint = class HHint extends base_message.BaseMessage {
             <h-portal ?disabled="${!this.opened}" @portal.open="${this._positionMessage}" to="${this.portalTarget}" hidden>
                 ${this.getSlot(base_message_constants.MESSAGE_CONTENT_SLOT_NAME)}
             </h-portal>
-            <div tabindex="0"></div>
         `;
     }
 };

package/build/cjs/packages/phoenix/src/components/messages/hints/hint.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/messages/tooltips/tooltip.js

@@ -20,7 +20,6 @@ exports.HTooltip = class HTooltip extends base_message.BaseMessage {
             <h-portal ?disabled="${!this.opened}" @portal.open="${this._positionMessage}" to="${this.portalTarget}" hidden>
                 ${this.getSlot(base_message_constants.MESSAGE_CONTENT_SLOT_NAME)}
             </h-portal>
-            <div tabindex="0"></div>
         `;
     }
 };

package/build/cjs/packages/phoenix/src/components/messages/tooltips/tooltip.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,+CAAmD;AAC3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/components/tabs/tabs.js

@@ -15,6 +15,7 @@ var tabs_constants = require('./tabs_constants.js');
 exports.HTabs = class HTabs extends phoenix_light_lit_element.PhoenixLightLitElement {
     constructor() {
         super(...arguments);
+        this.watchChildrenRendered = true;
         this._handleArrowNavigation = ({ key }) => {
             const currentTabIndex = this._getFocusedTabIndex();
             if (currentTabIndex === undefined)
@@ -44,7 +45,8 @@ exports.HTabs = class HTabs extends phoenix_light_lit_element.PhoenixLightLitEle
         new keystrokes_controller.KeystrokesController({
             host: this,
             keys: ['ArrowRight', 'ArrowLeft'],
-            callback: this._handleArrowNavigation
+            callback: this._handleArrowNavigation,
+            target: this
         });
     }
     _getFocusedTabIndex() {

package/build/cjs/packages/phoenix/src/components/tabs/tabs.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/controllers/btn_controller.js

@@ -12,8 +12,9 @@ class BtnController {
         this.host.setAttribute('role', 'button');
         this._keystrokesController = new keystrokes_controller.KeystrokesController({
             host,
-            keys: [' ', 'enter'],
-            callback
+            keys: ['enter', ' '],
+            callback,
+            target: host
         });
     }
     hostConnected() { }

package/build/cjs/packages/phoenix/src/controllers/btn_controller.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/controllers/keystrokes_controller/keystrokes_controller.js

@@ -4,47 +4,91 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib_es6 = require('../../../../../external/tslib/tslib.es6.js');
 require('lit');
-var keystrokes_controller_constants = require('./keystrokes_controller_constants.js');
 
-var _KeystrokesController_host;
+var _KeystrokesController_host, _KeystrokesController_target;
 class KeystrokesController {
-    constructor({ host, keys, callback }) {
+    constructor({ host, keys, callback, target }) {
         _KeystrokesController_host.set(this, void 0);
+        _KeystrokesController_target.set(this, void 0);
         this._buffer = [];
-        this._lastKeyTime = Date.now();
-        this._catchKeySequence = (ev) => {
-            // ev.stopImmediatePropagation();
+        this._clearBuffer = () => {
+            this._buffer = [];
+        };
+        this._saveKey = (ev) => {
             const key = ev.key.toLowerCase();
-            const currentTime = Date.now();
-            if (currentTime - this._lastKeyTime > keystrokes_controller_constants.KEYSTROKE_DELAY_IN_MS) {
-                this._buffer = [];
+            if (!this._buffer.includes(key))
+                this._buffer = [...this._buffer, key];
+            this._bindSavedKeysWithCallback(ev, this._buffer);
+        };
+        this._bindSavedKeysWithCallback = (ev, savedKeys) => {
+            if (typeof this._keys === 'string') {
+                this._bindWithOneKey(ev, savedKeys);
+                return;
             }
-            this._buffer.push(key);
-            this._lastKeyTime = currentTime;
-            this._bindKeysWithCallback(ev, this._buffer.join(''));
+            const areAllKeysPressed = this._isKeySequenceMultiple(this._keys)
+                ? this._areAllKeysPressedInMultipleSequences(this._keys, savedKeys)
+                : this._isOneOfTheKeysPressed(this._keys, savedKeys);
+            if (areAllKeysPressed)
+                this._callback(ev);
         };
-        this._bindKeysWithCallback = (ev, keySequence) => {
-            const isCorrectKeyPressed = !!this._keys.find((key) => {
-                return key.toLowerCase() === keySequence;
+        this._bindWithOneKey = (ev, savedKeys) => {
+            if (!savedKeys.includes(this._keys))
+                return;
+            this._callback(ev);
+        };
+        this._isKeySequenceMultiple = (keySequence) => {
+            const firstSequence = keySequence[0];
+            if (typeof firstSequence === 'object')
+                return true;
+            return false;
+        };
+        this._areAllKeysPressedInMultipleSequences = (keySequences, savedKeys) => {
+            return !!keySequences.find((keySequence) => {
+                return this._areAllKeysPressedInSingleSequence(keySequence, savedKeys);
             });
-            if (isCorrectKeyPressed) {
-                this._buffer = [];
-                this._callback(ev);
-            }
+        };
+        this._areAllKeysPressedInSingleSequence = (keySequence, savedKeys) => {
+            const indexesInSavedKeys = this._calculateIndexesInSavedKeys(keySequence, savedKeys);
+            if (indexesInSavedKeys.includes(-1))
+                return false;
+            const firstPressedKeyIndex = indexesInSavedKeys[0];
+            const lastPressedKeyIndex = indexesInSavedKeys[indexesInSavedKeys.length - 1];
+            const areKeysPressedSequentially = lastPressedKeyIndex - firstPressedKeyIndex === indexesInSavedKeys.length - 1;
+            return areKeysPressedSequentially;
+        };
+        this._isOneOfTheKeysPressed = (keys, savedKeys) => {
+            const indexesInSavedKeys = this._calculateIndexesInSavedKeys(keys, savedKeys);
+            return typeof indexesInSavedKeys.find((index) => index > -1) === 'number';
+        };
+        this._calculateIndexesInSavedKeys = (keySequence, savedKeys) => {
+            return keySequence.reduce((allIndexes, currentKeyInSequence) => {
+                return [...allIndexes, savedKeys.indexOf(currentKeyInSequence.toLowerCase())];
+            }, []);
+        };
+        // do ogrania jeszcze string czyli zapięcie się na jeden guzik
+        this._removeKey = (ev) => {
+            const key = ev.key.toLowerCase();
+            if (this._buffer.includes(key))
+                this._buffer = this._buffer.filter((currentSavedKey) => currentSavedKey !== key);
         };
         tslib_es6.__classPrivateFieldSet(this, _KeystrokesController_host, host, "f");
+        tslib_es6.__classPrivateFieldSet(this, _KeystrokesController_target, target, "f");
         this._keys = keys;
         this._callback = callback;
         tslib_es6.__classPrivateFieldGet(this, _KeystrokesController_host, "f").addController(this);
+        tslib_es6.__classPrivateFieldGet(this, _KeystrokesController_target, "f").addEventListener('keydown', this._saveKey);
+        tslib_es6.__classPrivateFieldGet(this, _KeystrokesController_target, "f").addEventListener('keyup', this._removeKey);
     }
     hostConnected() {
-        tslib_es6.__classPrivateFieldGet(this, _KeystrokesController_host, "f").addEventListener('keydown', this._catchKeySequence);
+        tslib_es6.__classPrivateFieldGet(this, _KeystrokesController_host, "f").addEventListener('focusout', this._clearBuffer);
     }
     hostDisconnected() {
-        tslib_es6.__classPrivateFieldGet(this, _KeystrokesController_host, "f").removeEventListener('keydown', this._catchKeySequence);
+        tslib_es6.__classPrivateFieldGet(this, _KeystrokesController_host, "f").removeEventListener('focusout', this._clearBuffer);
+        tslib_es6.__classPrivateFieldGet(this, _KeystrokesController_target, "f").addEventListener('keydown', this._saveKey);
+        tslib_es6.__classPrivateFieldGet(this, _KeystrokesController_target, "f").addEventListener('keyup', this._removeKey);
     }
 }
-_KeystrokesController_host = new WeakMap();
+_KeystrokesController_host = new WeakMap(), _KeystrokesController_target = new WeakMap();
 
 exports.KeystrokesController = KeystrokesController;
 //# sourceMappingURL=keystrokes_controller.js.map

package/build/cjs/packages/phoenix/src/controllers/keystrokes_controller/keystrokes_controller.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}

package/build/cjs/packages/phoenix/src/core/phoenix_light_lit_element/phoenix_light_lit_element.js

@@ -12,6 +12,8 @@ class PhoenixLightLitElement extends lit.LitElement {
     constructor() {
         super(...arguments);
         this._slots = {};
+        this.watchChildrenRendered = false;
+        this.watchChildrenConnected = false;
         this.isWebComponentConnected = false;
         this.isWebComponentRendered = false;
         this._childrenForConnectionToWatch = [];
@@ -54,14 +56,16 @@ class PhoenixLightLitElement extends lit.LitElement {
         this._dispatchLifecycleEvent(phoenix_light_lit_elements_constants.PHOENIX_LIGHT_LIT_ELEMENTS_EVENT_NAMES.rendered);
         this.isWebComponentRendered = true;
     }
-    _setupChildrenWatch() {
+    _setupChildrenConnectedWatch() {
         this._childrenForConnectionToWatch = this.childrenToWatch ? this.childrenToWatch : this._getComponentsNamesForConnectionToWatch();
-        this._childrenForRenderToWatch = this.childrenToWatch ? this.childrenToWatch : this._getComponentsNamesForRenderedToWatch();
         if (!this._childrenForConnectionToWatch.length)
             this.allChildrenConnected();
+        this.addEventListener(phoenix_light_lit_elements_constants.PHOENIX_LIGHT_LIT_ELEMENTS_EVENT_NAMES.connected, this._handleComponentConnected);
+    }
+    _setupChildrenRenderWatch() {
+        this._childrenForRenderToWatch = this.childrenToWatch ? this.childrenToWatch : this._getComponentsNamesForRenderedToWatch();
         if (!this._childrenForRenderToWatch.length)
             this.allChildrenRendered();
-        this.addEventListener(phoenix_light_lit_elements_constants.PHOENIX_LIGHT_LIT_ELEMENTS_EVENT_NAMES.connected, this._handleComponentConnected);
         this.addEventListener(phoenix_light_lit_elements_constants.PHOENIX_LIGHT_LIT_ELEMENTS_EVENT_NAMES.rendered, this._handleComponentRendered);
     }
     _getComponentsNamesForConnectionToWatch() {
@@ -74,7 +78,10 @@ class PhoenixLightLitElement extends lit.LitElement {
         super.connectedCallback();
         this._dispatchLifecycleEvent(phoenix_light_lit_elements_constants.PHOENIX_LIGHT_LIT_ELEMENTS_EVENT_NAMES.connected);
         this.isWebComponentConnected = true;
-        this._setupChildrenWatch();
+        if (this.watchChildrenConnected)
+            this._setupChildrenConnectedWatch();
+        if (this.watchChildrenRendered)
+            this._setupChildrenRenderWatch();
     }
     allChildrenConnected() { }
     allChildrenRendered() { }

package/build/cjs/packages/phoenix/src/core/phoenix_light_lit_element/phoenix_light_lit_element.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}
+{"version":3,"file":null,"sources":[null],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA,wBAAwB,4CAAgD;AACxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;"}