From 1aec0efbb3d4b0e5d91de11902c82f1603cdc397 Mon Sep 17 00:00:00 2001 From: Alex Yegerev <1755578+lexxcode@users.noreply.github.com> Date: Thu, 2 Mar 2023 12:54:20 +0200 Subject: [PATCH 1/2] BB-22179: Incorrect focus behavior after rotating on tablet/mobile (#34921) --- CHANGELOG.md | 5 +++++ composer.json | 2 +- dev.json | 2 +- dev.lock | 2 +- src/Oro/Bundle/UIBundle/Resources/config/oro/assets.yml | 2 +- src/Oro/Bundle/UIBundle/Resources/config/oro/jsmodules.yml | 2 +- .../Resources/views/layouts/view-switcher/config/assets.yml | 2 +- .../views/layouts/view-switcher/config/jsmodules.yml | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b25d65aca5a..0fc5c4e5bfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ The upgrade instructions are available at [Oro documentation website](https://do The current file describes significant changes in the code that may affect the upgrade of your customizations. +### Changed +* Updated from `slick-carousel: 1.7.1` to fork `@oroinc/slick-carousel: 1.7.1-oro1` with patched internal `postSlide` method +* Updated path of styles from `~slick-carousel/slick/slick.scss` to `~@oroinc/slick-carousel/slick/slick.scss` + and path of js from `slick-carousel/slick/slick` to `@oroinc/slick-carousel/slick/slick` + ## Changes in the Platform package versions - [5.1.0](#510-unreleased) diff --git a/composer.json b/composer.json index f97af47e3d5..081abec6ed7 100644 --- a/composer.json +++ b/composer.json @@ -206,7 +206,7 @@ "@oroinc/bootstrap": "4.3.1-oro2", "popper.js": "1.16.1", "asap": "2.0.6", - "slick-carousel": "1.7.1", + "@oroinc/slick-carousel": "1.7.1-oro1", "xregexp": "^5.1.0", "scriptjs": "2.5.9", "focus-visible": "5.2.0", diff --git a/dev.json b/dev.json index 5bdd0d58da5..3a2ca0bbd97 100644 --- a/dev.json +++ b/dev.json @@ -209,7 +209,7 @@ "@oroinc/bootstrap": "4.3.1-oro2", "popper.js": "1.16.1", "asap": "2.0.6", - "slick-carousel": "1.7.1", + "@oroinc/slick-carousel": "1.7.1-oro1", "xregexp": "^5.1.0", "scriptjs": "2.5.9", "focus-visible": "5.2.0", diff --git a/dev.lock b/dev.lock index 67cd8b6bf96..b028d22e8a6 100644 --- a/dev.lock +++ b/dev.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cb2c06b83eb5ec0f9d890fbc9f3594be", + "content-hash": "40ffac61602a533b7a0056024a65ec2a", "packages": [ { "name": "ass/xmlsecurity", diff --git a/src/Oro/Bundle/UIBundle/Resources/config/oro/assets.yml b/src/Oro/Bundle/UIBundle/Resources/config/oro/assets.yml index 3c578ca4d5c..15754a30ff8 100644 --- a/src/Oro/Bundle/UIBundle/Resources/config/oro/assets.yml +++ b/src/Oro/Bundle/UIBundle/Resources/config/oro/assets.yml @@ -12,7 +12,7 @@ css: - 'bundles/oroui/css/scss/bootstrap/bootstrap.scss' # Libraries styles - - '~slick-carousel/slick/slick.scss' + - '~@oroinc/slick-carousel/slick/slick.scss' - 'bundles/oroui/css/scss/font-awesome/_core.scss' - 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker.css' - 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker-fontawesome.css' diff --git a/src/Oro/Bundle/UIBundle/Resources/config/oro/jsmodules.yml b/src/Oro/Bundle/UIBundle/Resources/config/oro/jsmodules.yml index f3aeaf540ba..cdcf7cf0822 100644 --- a/src/Oro/Bundle/UIBundle/Resources/config/oro/jsmodules.yml +++ b/src/Oro/Bundle/UIBundle/Resources/config/oro/jsmodules.yml @@ -49,7 +49,7 @@ aliases: popper$: popper.js/dist/popper popper-utils$: popper.js/dist/popper-utils scriptjs$: scriptjs/dist/script - slick$: slick-carousel/slick/slick + slick$: '@oroinc/slick-carousel/slick/slick' styled-scroll-bar$: oroui/js/app/plugins/styled-scroll-bar underscore$: underscore/underscore app-modules: diff --git a/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/assets.yml b/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/assets.yml index d2e52e26e3e..1ae3bef3f73 100644 --- a/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/assets.yml +++ b/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/assets.yml @@ -4,7 +4,7 @@ styles: - 'bundles/oroui/css/scss/settings/global-settings.scss' # Styles - - '~slick-carousel/slick/slick.scss' + - '~@oroinc/slick-carousel/slick/slick.scss' - 'bundles/oroui/css/scss/oro/loading/loading-bar.scss' - 'bundles/oroui/css/scss/font-awesome/_core.scss' - 'bundles/oroviewswitcher/view-switcher/scss/styles.scss' diff --git a/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/jsmodules.yml b/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/jsmodules.yml index 5603d2b0f02..f301a49c70e 100644 --- a/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/jsmodules.yml +++ b/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/jsmodules.yml @@ -10,7 +10,7 @@ aliases: module-config$: oroui/js/app/services/module-config oroui/js/app$: oroviewswitcher/js/app/views/demo/demo routing$: fosjsrouting/js/router - slick$: slick-carousel/slick/slick + slick$: '@oroinc/slick-carousel/slick/slick' underscore$: underscore/underscore configs: orotranslation/js/translator: {} From c5f9be2f01eb5f24f94dadb5a8d5f5b7a59c49fd Mon Sep 17 00:00:00 2001 From: Alex Yegerev <1755578+lexxcode@users.noreply.github.com> Date: Thu, 2 Mar 2023 22:49:10 +0200 Subject: [PATCH 2/2] BB-22129: Filter manager dropdown menu is immediately closed after turning on/off a single filter in storefront sidebar (#34947) --- .../FilterBundle/Resources/public/js/filters-manager.js | 3 +++ .../UIBundle/Resources/public/js/extend/jquery.multiselect.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js index 3f530b5639e..bc6fef455f2 100644 --- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js +++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js @@ -740,6 +740,9 @@ define(function(require, exports, module) { refresh: () => { this.selectWidget.onRefresh(); }, + beforeclose: () => { + return this.ignoreFiltersUpdateEvents === false; + }, close: () => { this.selectWidget.onClose(); }, diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js index 5acc62c9b27..388c38bed17 100644 --- a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js +++ b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js @@ -67,7 +67,7 @@ define(function(require) { this._bindHeaderEvents(); const events = ['mousedown', 'clearMenus'] - .map(eventName => `${eventName}.${this._namespaceID}`) + .map(eventName => `${eventName}${this._namespaceID}`) .join(' '); // close each widget when clicking on any other element/anywhere else on the page @@ -81,7 +81,7 @@ define(function(require) { // restored to their defaultValue prop on form reset, and the reset // handler fires before the form is actually reset. delaying it a bit // gives the form inputs time to clear. - $(this.element[0].form).on(`reset.${this._namespaceID}`, () => { + $(this.element[0].form).on(`reset${this._namespaceID}`, () => { setTimeout(this.refresh.bind(this), 10); }); },