IBX-2658: Introduce adaptive filters #392
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| (function (global, doc, ibexa, bootstrap) { | ||
| const adaptiveFilters = doc.querySelectorAll('.ibexa-adaptive-filters'); | ||
| const initializeAdaptiveFilters = (adaptiveFilter) => { | ||
| const adaptiveItemsContainer = adaptiveFilter.querySelector('.ibexa-adaptive-filters__items'); | ||
| const adaptiveItemsCollapsibleContainer = adaptiveFilter.querySelector('.ibexa-adaptive-filters__collapsible'); | ||
| const adaptiveItemsCollapsibleContentContainer = adaptiveFilter.querySelector('.ibexa-adaptive-filters__collapsible-content'); | ||
| const actionsContainer = adaptiveFilter.querySelector('.ibexa-adaptive-filters__actions'); | ||
| const toggleBtn = adaptiveFilter.querySelector('.ibexa-adaptive-filters__toggler'); | ||
| const collapse = bootstrap.Collapse.getOrCreateInstance(adaptiveItemsCollapsibleContainer, { | ||
| toggle: false, | ||
| }); | ||
| const adaptiveItems = new ibexa.core.AdaptiveItems({ | ||
| itemHiddenClass: 'ibexa-adaptive-filters__item--hidden', | ||
| container: adaptiveItemsContainer, | ||
| getActiveItem: () => null, | ||
| prepareItemsBeforeAdapt: () => { | ||
| [...adaptiveItemsCollapsibleContentContainer.children].forEach((child) => | ||
| adaptiveItemsContainer.insertBefore(child, actionsContainer), | ||
| ); | ||
| }, | ||
| onAdapted: (visibleItems, hiddenItems) => { | ||
| if (hiddenItems.size === 0) { | ||
| collapse.hide(); | ||
| } | ||
|
|
||
| hiddenItems.forEach((hiddenItem) => adaptiveItemsCollapsibleContentContainer.append(hiddenItem)); | ||
| }, | ||
| }); | ||
| adaptiveItemsCollapsibleContainer.addEventListener('hide.bs.collapse', () => { | ||
| toggleBtn.classList.add('ibexa-adaptive-filters__toggler--collapsed'); | ||
| adaptiveItemsCollapsibleContainer.classList.add('ibexa-adaptive-filters__collapsible--collapsed'); | ||
| adaptiveItemsCollapsibleContentContainer.classList.add('ibexa-adaptive-filters__collapsible-content--collapsed'); | ||
| }); | ||
| adaptiveItemsCollapsibleContainer.addEventListener('show.bs.collapse', () => { | ||
| toggleBtn.classList.remove('ibexa-adaptive-filters__toggler--collapsed'); | ||
| adaptiveItemsCollapsibleContainer.classList.remove('ibexa-adaptive-filters__collapsible--collapsed'); | ||
| adaptiveItemsCollapsibleContentContainer.classList.remove('ibexa-adaptive-filters__collapsible-content--collapsed'); | ||
| }); | ||
| adaptiveItems.init(); | ||
| }; | ||
|
|
||
| adaptiveFilters.forEach(initializeAdaptiveFilters); | ||
| })(window, window.document, window.ibexa, window.bootstrap); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| .ibexa-adaptive-filters { | ||
| display: flex; | ||
| flex-direction: column; | ||
| padding: calculateRem(4px) calculateRem(16px) 0 calculateRem(16px); | ||
| border-radius: $ibexa-border-radius; | ||
| border: calculateRem(1px) solid $ibexa-color-light; | ||
| box-shadow: calculateRem(4px) calculateRem(22px) calculateRem(47px) 0 rgba($ibexa-color-info, 0.05); | ||
|
|
||
| &--no-labels { | ||
| padding-top: calculateRem(16px); | ||
|
|
||
| .ibexa-adaptive-filters { | ||
| &__items { | ||
| height: 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &--no-collapsible-items { | ||
| .ibexa-adaptive-filters { | ||
| &__static-left { | ||
| width: calculateRem(450px); | ||
| border-right-width: 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &--inside-container { | ||
| margin: calculateRem(-33px) calculateRem(-33px) calculateRem(24px) calculateRem(-33px); | ||
| } | ||
|
|
||
| &__visible { | ||
| display: flex; | ||
| align-items: flex-end; | ||
| width: 100%; | ||
| margin-bottom: calculateRem(16px); | ||
| } | ||
|
|
||
| &__static-left { | ||
| flex-grow: 0; | ||
| display: flex; | ||
| align-items: flex-end; | ||
| height: calculateRem(48px); | ||
| width: calculateRem(300px); | ||
| padding-right: calculateRem(16px); | ||
| margin-right: calculateRem(16px); | ||
| border-right: calculateRem(1px) solid $ibexa-color-light; | ||
|
|
||
| .form-group { | ||
| width: 100%; | ||
| } | ||
| } | ||
|
|
||
| &__actions { | ||
| display: flex; | ||
| align-items: flex-end; | ||
| } | ||
|
|
||
| &__toggler-wrapper { | ||
| display: flex; | ||
| align-items: flex-end; | ||
| margin-left: auto; | ||
| padding: calculateRem(8px) calculateRem(2px) calculateRem(8px); | ||
| border-left: calculateRem(1px) solid $ibexa-color-light; | ||
|
|
||
| &.ibexa-adaptive-filters__item--hidden { | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
| &__items { | ||
| flex-grow: 2; | ||
| display: flex; | ||
| align-items: flex-end; | ||
| height: calculateRem(79px); | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| &__collapsible { | ||
| border-top: calculateRem(1px) solid $ibexa-color-light; | ||
| transition: all $ibexa-admin-transition-duration $ibexa-admin-transition; | ||
|
|
||
| &--collapsed { | ||
| border-top-color: transparent; | ||
| } | ||
| } | ||
|
|
||
| &__collapsible-content { | ||
| display: flex; | ||
| padding: calculateRem(8px) 0 calculateRem(16px); | ||
| opacity: 1; | ||
| transition: all $ibexa-admin-transition-duration $ibexa-admin-transition; | ||
|
|
||
| &--collapsed { | ||
| opacity: 0; | ||
| } | ||
| } | ||
|
|
||
| &__item { | ||
| display: flex; | ||
| align-items: flex-end; | ||
| padding-right: calculateRem(16px); | ||
|
|
||
| .ibexa-label { | ||
| margin-top: 0; | ||
| } | ||
| } | ||
|
|
||
| &__toggler { | ||
| font-weight: bold; | ||
| opacity: 1; | ||
|
|
||
| .ibexa-icon { | ||
| transform: rotate(-90deg); | ||
| transition: all $ibexa-admin-transition-duration $ibexa-admin-transition; | ||
| } | ||
|
|
||
| .ibexa-btn { | ||
| &__label { | ||
| &--more { | ||
| display: none; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &.ibexa-adaptive-filters__item--hidden { | ||
| opacity: 0; | ||
| } | ||
|
|
||
| &--collapsed { | ||
| .ibexa-icon { | ||
| transform: rotate(90deg); | ||
| } | ||
|
|
||
| .ibexa-btn { | ||
| &__label { | ||
| &--less { | ||
| display: none; | ||
| } | ||
|
|
||
| &--more { | ||
| display: initial; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2"> | ||
| <file source-language="en" target-language="en" datatype="plaintext" original="not.available"> | ||
| <header> | ||
| <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/> | ||
| <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note> | ||
| </header> | ||
| <body> | ||
| <trans-unit id="c01c090bbfe9cd32a0a37ffc5727688abe01c30f" resname="actions.apply_btn"> | ||
| <source>Apply</source> | ||
| <target state="new">Apply</target> | ||
| <note>key: actions.apply_btn</note> | ||
| </trans-unit> | ||
| <trans-unit id="e3eeaff256b4c7e7597477c8ab94aca52265d5b8" resname="actions.clear_btn"> | ||
| <source>Clear filters</source> | ||
| <target state="new">Clear filters</target> | ||
| <note>key: actions.clear_btn</note> | ||
| </trans-unit> | ||
| <trans-unit id="67fc4ec6b05265db6a275d88f8df4e09c727fa58" resname="toggler.close"> | ||
| <source>Less filters</source> | ||
| <target state="new">Less filters</target> | ||
| <note>key: toggler.close</note> | ||
| </trans-unit> | ||
| <trans-unit id="3d0affb0e0a5f08df3390232a861d63d283d6b1d" resname="toggler.open"> | ||
| <source>More filters</source> | ||
| <target state="new">More filters</target> | ||
| <note>key: toggler.open</note> | ||
| </trans-unit> | ||
| </body> | ||
| </file> | ||
| </xliff> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| {% import "@ibexadesign/ui/component/macros.html.twig" as html %} | ||
|
|
||
| {% trans_default_domain 'adaptive_filters' %} | ||
|
|
||
| {% set attr = attr|default({})|merge({ | ||
| class: ('ibexa-adaptive-filters ' | ||
| ~ (no_labels|default(false) ? 'ibexa-adaptive-filters--no-labels ') | ||
| ~ (no_collapsible_items|default(false) ? 'ibexa-adaptive-filters--no-collapsible-items ') | ||
| ~ (is_inside_container|default(false) ? 'ibexa-adaptive-filters--inside-container ') | ||
| ~ attr.class|default(''))|trim, | ||
| }) %} | ||
| {% set attr_form = attr_form|default({}) %} | ||
| {% set collapse_id = collapse_id|default('ibexa-adaptive-filters-collapse-' ~ random()) %} | ||
|
|
||
| {{ form_start(form, { attr: attr|merge(attr_form)}) }} | ||
| <div class="ibexa-adaptive-filters__visible"> | ||
| <div class="ibexa-adaptive-filters__static-left"> | ||
| {% block static_left %} | ||
| <div class="form-group"> | ||
| <label class="ibexa-label"></label> | ||
| {% block static_left_input %}{% endblock %} | ||
| </div> | ||
| {% endblock %} | ||
| </div> | ||
| <div class="ibexa-adaptive-filters__items ibexa-adaptive-filters__items--empty ibexa-adaptive-items"> | ||
| {% if not no_collapsible_items|default(false) %} | ||
| {% block collapsible_items %} | ||
| {% for item in collapsible_items %} | ||
| {% include '@ibexadesign/ui/component/adaptive_filters/adaptive_filters_item.html.twig' with { | ||
| content: item, | ||
| } %} | ||
| {% endfor %} | ||
| {% endblock %} | ||
| {% endif %} | ||
| <div class="ibexa-adaptive-filters__actions ibexa-adaptive-items__item ibexa-adaptive-items__item--force-show"> | ||
| {% block actions %} | ||
| <button | ||
| type="submit" | ||
| class="btn ibexa-btn ibexa-btn--secondary ibexa-adaptive-filters__submit-btn" | ||
| > | ||
| {{ 'actions.apply_btn'|trans|desc('Apply') }} | ||
| </button> | ||
| <button | ||
| type="button" | ||
| class="btn ibexa-btn ibexa-btn--ghost ibexa-adaptive-filters__clear-btn" | ||
| > | ||
| <svg class="ibexa-icon ibexa-icon--small"> | ||
| <use xlink:href="{{ ibexa_icon_path('discard') }}"></use> | ||
| </svg> | ||
| <span class="ibexa-btn__label"> | ||
| {{ 'actions.clear_btn'|trans|desc('Clear filters') }} | ||
| </span> | ||
| </button> | ||
| {% endblock %} | ||
| </div> | ||
| <div | ||
| class=" | ||
| ibexa-adaptive-filters__toggler-wrapper | ||
|
There was a problem hiding this comment. not sure if it has to be multiline, imo multiline is needed only if you add conditional expressions in class There was a problem hiding this comment. It would be quite long when written in one line |
||
| ibexa-adaptive-filters__item--hidden | ||
| ibexa-adaptive-items__item | ||
| ibexa-adaptive-items__item--selector" | ||
| > | ||
| <button | ||
| type="button" | ||
| class=" | ||
| btn ibexa-btn ibexa-btn--ghost ibexa-btn--small | ||
| ibexa-adaptive-filters__toggler ibexa-adaptive-filters__toggler--collapsed" | ||
| data-bs-toggle="collapse" | ||
| data-bs-target="#{{ collapse_id }}" | ||
| aria-expanded="false" | ||
| aria-controls="{{ collapse_id }}" | ||
| > | ||
| <svg class="ibexa-icon ibexa-icon--small"> | ||
| <use xlink:href="{{ ibexa_icon_path('caret-next') }}"></use> | ||
| </svg> | ||
| <span class="ibexa-btn__label ibexa-btn__label--more"> | ||
| {{ 'toggler.open'|trans|desc('More filters') }} | ||
| </span> | ||
| <span class="ibexa-btn__label ibexa-btn__label--less"> | ||
| {{ 'toggler.close'|trans|desc('Less filters') }} | ||
| </span> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="ibexa-adaptive-filters__collapsible collapse" id="{{ collapse_id }}"> | ||
| <div class="ibexa-adaptive-filters__collapsible-content"></div> | ||
| </div> | ||
| {{ form_end(form) }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <div class="ibexa-adaptive-filters__item ibexa-adaptive-items__item"> | ||
| {% block content %} | ||
| {{ item|default('')|raw }} | ||
| {% endblock %} | ||
| </div> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
personally I don't like conditional expression inside ternary operator, imo it's hard to read and understand
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you have a proposition on how to split it into a few lines?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BTW This fragment was also discussed in comments here: ezsystems/ezplatform-admin-ui#1780 (comment)