Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBX-6240: Create general css classes for switcher (from edit form left menu) #850

Merged
merged 5 commits into from
Aug 17, 2023
Merged

IBX-6240: Create general css classes for switcher (from edit form left menu) #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
280915c
IBX-6240: Create general css classes for switcher (from edit form lef…
GrabowskiM Jul 27, 2023
f993a45
linter
GrabowskiM Jul 28, 2023
b043eeb
rename to ibexa-tabs-switcher
GrabowskiM Aug 9, 2023
984ec0e
linter fix
GrabowskiM Aug 10, 2023
f924eb4
[Behat] Updated tests after selector changes in IBX-6240
micszo Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/bundle/Resources/public/js/scripts/admin.anchor.navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
};
let currentlyVisibleSections = getSectionGroupActiveItems();
const attachSectionGroupsMenuListEvents = () => {
const items = doc.querySelectorAll(
'.ibexa-anchor-navigation-menu__section-groups--list .ibexa-anchor-navigation-menu__section-groups-item',
);
const items = doc.querySelectorAll('.ibexa-anchor-navigation-menu__section-groups--list .ibexa-tab-switcher__item');

items.forEach((item) => item.addEventListener('click', onSelectSectionGroupsMenuList, false));
};
Expand All @@ -41,11 +39,11 @@
const { targetId } = event.currentTarget.dataset;
const sectionsMenuNode = doc.querySelector(`.ibexa-anchor-navigation-menu__sections[data-id="${targetId}"]`);
const sectionGroupsMenuItems = doc.querySelectorAll(
'.ibexa-anchor-navigation-menu__section-groups--list .ibexa-anchor-navigation-menu__section-groups-item',
'.ibexa-anchor-navigation-menu__section-groups--list .ibexa-tab-switcher__item',
);

sectionGroupsMenuItems.forEach((item) => {
item.classList.toggle('ibexa-anchor-navigation-menu__section-groups-item--active', item.isSameNode(event.currentTarget));
item.classList.toggle('ibexa-tab-switcher__item--active', item.isSameNode(event.currentTarget));
});
showSectionGroup(targetId);
showSectionsMenu(sectionsMenuNode);
Expand Down Expand Up @@ -205,17 +203,17 @@
const { id } = sectionGroup.dataset;
const hasGroupError = !!sectionGroup.querySelector('.is-invalid');
const correspondingMenuItem =
doc.querySelector(`.ibexa-anchor-navigation-menu__section-groups-item[data-target-id="${id}"]`) ??
doc.querySelector(`.ibexa-tab-switcher__item[data-target-id="${id}"]`) ??
doc.querySelector(`.ibexa-anchor-navigation-menu .ibexa-dropdown__item[data-value="${id}"]`);

if (!correspondingMenuItem) {
return;
}

const errorIconNode = correspondingMenuItem.querySelector('.ibexa-anchor-navigation-menu__item-error');
const errorIconNode = correspondingMenuItem.querySelector('.ibexa-tab-switcher__item-error');
const dropdownWidget = doc.querySelector('.ibexa-anchor-navigation-menu .ibexa-dropdown');

errorIconNode.classList.toggle('ibexa-anchor-navigation-menu__item-error--hidden', !hasGroupError);
errorIconNode.classList.toggle('ibexa-tab-switcher__item-error--hidden', !hasGroupError);

if (dropdownWidget) {
const hasError = !!dropdownWidget.querySelector(
Expand Down
22 changes: 0 additions & 22 deletions src/bundle/Resources/public/scss/_anchor-navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,28 +69,6 @@
max-width: calculateRem(420px);
width: calc(25vw - #{calculateRem(50px)});
height: calculateRem(48px);

&--list {
padding: calculateRem(4px);
border-radius: $ibexa-border-radius;
background-color: $ibexa-color-light-300;
display: flex;
}
}

&__section-groups-item {
height: calculateRem(40px);
padding: calculateRem(10px);
border-radius: $ibexa-border-radius;
border: 0;
flex-basis: 100%;
text-align: center;
overflow: hidden;

&--active {
background-color: $ibexa-color-white;
font-weight: 600;
}
}

&__sections {
Expand Down
35 changes: 35 additions & 0 deletions src/bundle/Resources/public/scss/_switcher.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
.ibexa-tab-switcher {
padding: calculateRem(4px);
border-radius: $ibexa-border-radius;
background-color: $ibexa-color-light-300;
display: flex;

&__item {
height: calculateRem(40px);
padding: calculateRem(10px);
border-radius: $ibexa-border-radius;
border: 0;
flex-basis: 100%;
text-align: center;
overflow: hidden;

&--active {
background-color: $ibexa-color-white;
font-weight: 600;
}
}

&__item-label {
text-overflow: ellipsis;
overflow: hidden;
}

&__item-error {
margin-top: calculateRem(-3px);
fill: $ibexa-color-danger;

&--hidden {
display: none;
}
}
}
1 change: 1 addition & 0 deletions src/bundle/Resources/public/scss/ibexa.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,4 @@
@import 'steps';
@import 'summary-tile';
@import 'double-input-range';
@import 'switcher';
10 changes: 5 additions & 5 deletions src/bundle/Resources/views/themes/admin/ui/menu/anchor_menu.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

{% block children_1st_level %}
{% for item in currentItem.children %}
{%- set itemClass = 'ibexa-anchor-navigation-menu__section-groups-item' %}
{%- set itemClass = 'ibexa-tab-switcher__item' %}
{%- if loop.first %}
{%- set itemClass = itemClass ~ ' ibexa-anchor-navigation-menu__section-groups-item--active' %}
{%- set itemClass = itemClass ~ ' ibexa-tab-switcher__item--active' %}
{%- endif %}
{%- do item.setAttribute('class', (item.getAttribute('class') ~ ' ' ~ itemClass)|trim) -%}
{%- do item.setAttribute('data-target-id', "#" ~ item.getAttribute('data-target-id')) -%}
Expand Down Expand Up @@ -140,9 +140,9 @@
{%- set itemTagElement = itemTagElement|default('button') %}

<{{ itemTagElement }}{{ knp_menu.attributes(attributes) }}>
<div class="ibexa-anchor-navigation-menu__item-label" title="{{ block('label')|raw }}">
<div class="ibexa-anchor-navigation-menu__item-label ibexa-tab-switcher__item-label" title="{{ block('label')|raw }}">
{{ block('label') }}
<svg class="ibexa-icon ibexa-icon--small ibexa-anchor-navigation-menu__item-error ibexa-anchor-navigation-menu__item-error--hidden">
<svg class="ibexa-icon ibexa-icon--small ibexa-tab-switcher__item-error ibexa-tab-switcher__item-error--hidden">
<use xlink:href="{{ ibexa_icon_path('warning-triangle') }}"></use>
</svg>
</div>
Expand All @@ -164,7 +164,7 @@
{% block root %}
<div class="ibexa-anchor-navigation">
{% if item.count() < 4 %}
{% set listAttributes = item.childrenAttributes|merge({'class': (listAttributes.class|default('') ~ ' ibexa-anchor-navigation-menu__section-groups ibexa-anchor-navigation-menu__section-groups--list')|trim}) %}
{% set listAttributes = item.childrenAttributes|merge({'class': (listAttributes.class|default('') ~ ' ibexa-anchor-navigation-menu__section-groups ibexa-anchor-navigation-menu__section-groups--list ibexa-tab-switcher')|trim}) %}
{% set innerChildrenBlock = 'children_1st_level' %}
{% set innerItemBlock = 'item_1st_level' %}
{% set tagElement = 'div' %}
Expand Down
6 changes: 3 additions & 3 deletions src/lib/Behat/Page/ContentUpdateItemPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ protected function specifyLocators(): array
new VisibleCSSLocator('noneditableFieldClass', 'ibexa-field-edit--eznoneditable'),
new VisibleCSSLocator('fieldOfType', '.ibexa-field-edit--%s'),
new VisibleCSSLocator('navigationTabs', '.ibexa-anchor-navigation-menu__sections-item-btn'),
new VisibleCSSLocator('navigationGroups', '.ibexa-anchor-navigation-menu__section-groups-item'),
new VisibleCSSLocator('navigationGroups', '.ibexa-tab-switcher__item'),
new VisibleCSSLocator('autosaveIsOnInfo', '.ibexa-autosave__status-on'),
new VisibleCSSLocator('autosaveSavedInfo', '.ibexa-autosave__status-saved'),
new VisibleCSSLocator('autosaveIsOffInfo', '.ibexa-autosave__status-off'),
Expand Down Expand Up @@ -239,12 +239,12 @@ public function switchToFieldTab(string $tabName): void
->click();
$this->getHTMLPage()
->setTimeout(10)
->waitUntilCondition(new ElementHasTextCondition($this->getHTMLPage(), new VisibleCSSLocator('activeSection', '.ibexa-anchor-navigation-menu__section-groups-item--active'), $tabName));
->waitUntilCondition(new ElementHasTextCondition($this->getHTMLPage(), new VisibleCSSLocator('activeSection', '.ibexa-tab-switcher__item--active'), $tabName));
}

public function verifyFieldCannotBeEditedDueToLimitation(string $fieldName)
{
$activeSections = $this->getHTMLPage()->findAll(new VisibleCSSLocator('activeSection', '.ibexa-anchor-navigation-menu__section-groups-item--active'));
$activeSections = $this->getHTMLPage()->findAll(new VisibleCSSLocator('activeSection', '.ibexa-tab-switcher__item--active'));
$fieldLocator = new VisibleCSSLocator('', sprintf($this
->getLocator('fieldGroupNthField')->getSelector(), $activeSections->single()->getAttribute('data-target-id'), $this->getFieldPosition($fieldName)));
$this->getHTMLPage()->find($fieldLocator)->assert()->hasClass('ibexa-field-edit--disabled');
Expand Down