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-9298: multiple Custom CSS - no visual indication of selected items #200

Open
wants to merge 2 commits into
base: 4.6
Choose a base branch
from
Open

IBX-9298: multiple Custom CSS - no visual indication of selected items #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94cf689
IBX-9298: multiple Custom CSS - no visual indication of selected items
GrabowskiM Dec 12, 2024
a9ebbe2
added missing files
GrabowskiM Dec 13, 2024
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
80 changes: 80 additions & 0 deletions src/bundle/Resources/public/js/CKEditor/common/chips-button-view/chips-button-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import View from '@ckeditor/ckeditor5-ui/src/view';

export default class IbexaChipsButtonView extends View {
constructor() {
super();
this.set({
style: undefined,
text: undefined,
id: undefined,
});
const bind = this.bindTemplate;
this.children = this.createCollection();
this.setTemplate({
tag: 'ul',
attributes: {
class: ['ibexa-ckeditor-dropdown-selected-items'],
style: bind.to('style'),
id: bind.to('id'),
},
children: this.children,
});

this.listenTo(this, 'change:text', (event, item, value) => {
const container = event.source.element;
const selectedItems = value.split(' ').filter((selectedItem) => selectedItem !== '');
let showOverflow = false;
let currentIndex = 0;

this.children.clear();

while (!showOverflow && currentIndex < selectedItems.length) {
const selectedItem = selectedItems[currentIndex];
const chip = this.createChip(selectedItem);

this.children.add(chip);

showOverflow = container.scrollWidth > container.offsetWidth;
currentIndex++;

if (showOverflow) {
this.children.remove(this.children.last);
}
}

if (showOverflow) {
const overflownItems = selectedItems.length - currentIndex + 1;
let overflowChip = this.createChip(`+${overflownItems}`);

this.children.add(overflowChip);

if (container.scrollWidth > container.offsetWidth) {
this.children.remove(this.children.last);
this.children.remove(this.children.last);

overflowChip = this.createChip(`+${overflownItems + 1}`);

this.children.add(overflowChip);
}
}
});
}

createChip(text) {
const chip = new View();

chip.setTemplate({
tag: 'li',
attributes: {
class: ['ibexa-ckeditor-dropdown-selected-items__item'],
},
children: [
{
text,
},
],
});

return chip;
}
}
38 changes: 38 additions & 0 deletions src/bundle/Resources/public/js/CKEditor/common/multivalue-dropdown/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import View from '@ckeditor/ckeditor5-ui/src/view';
import ListView from '@ckeditor/ckeditor5-ui/src/list/listview';

import ChipsButtonView from '../../common/chips-button-view/chips-button-view';

export const addMultivalueSupport = (labeledDropdown, config) => {
labeledDropdown.fieldView.panelView.extendTemplate({
attributes: {
class: 'ck-dropdown__panel--multiple',
},
});

labeledDropdown.fieldView.buttonView.labelView = labeledDropdown.fieldView.buttonView._setupLabelView(new ChipsButtonView());

labeledDropdown.fieldView.panelView.children.on('add', (event, panelViewItem) => {
if (!(panelViewItem instanceof ListView)) {
return;
}

const selectedItems = new Set(labeledDropdown.fieldView.element.value?.split(' '));

panelViewItem.items.forEach((item, key) => {
const itemValue = config.choices[key];
const isSelected = selectedItems.has(itemValue);
const inputView = new View();

inputView.setTemplate({
tag: 'input',
attributes: {
class: 'ibexa-ckeditor-input--checkbox',
type: 'checkbox',
checked: isSelected,
},
});
item.children.get(0).children.add(inputView, 0);
});
});
};
16 changes: 14 additions & 2 deletions src/bundle/Resources/public/js/CKEditor/custom-attributes/ui/custom-attributes-form-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { addListToDropdown } from '@ckeditor/ckeditor5-ui/src/dropdown/utils';

import { createLabeledInputNumber } from '../../common/input-number/utils';
import { createLabeledSwitchButton } from '../../common/switch-button/utils';
import { addMultivalueSupport } from '../../common/multivalue-dropdown/utils';

class IbexaCustomAttributesFormView extends View {
constructor(props) {
Expand Down Expand Up @@ -198,7 +199,7 @@ class IbexaCustomAttributesFormView extends View {

config.choices.forEach((choice) => {
itemsList.add({
type: 'button',
type: config.multiple ? 'switchbutton' : 'button',
model: new Model({
withText: true,
label: choice,
Expand All @@ -209,8 +210,19 @@ class IbexaCustomAttributesFormView extends View {

addListToDropdown(labeledDropdown.fieldView, itemsList);

if (config.multiple) {
addMultivalueSupport(labeledDropdown, config);
}

this.listenTo(labeledDropdown.fieldView, 'execute', (event) => {
const value = this.getNewValue(event.source.value, config.multiple, labeledDropdown.fieldView.element.value);
const dropdownValue = labeledDropdown.fieldView.element.value;
const value = this.getNewValue(event.source.value, config.multiple, dropdownValue);

if (config.multiple) {
const isSelected = value.length > dropdownValue.length;

event.source.children.get(0).element.checked = isSelected;
}

labeledDropdown.fieldView.buttonView.set({
label: value,
Expand Down
16 changes: 14 additions & 2 deletions src/bundle/Resources/public/js/CKEditor/link/ui/link-form-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { addListToDropdown } from '@ckeditor/ckeditor5-ui/src/dropdown/utils';

import { createLabeledSwitchButton } from '../../common/switch-button/utils';
import { createLabeledInputNumber } from '../../common/input-number/utils';
import { addMultivalueSupport } from '../../common/multivalue-dropdown/utils';
import { getCustomAttributesConfig, getCustomClassesConfig } from '../../custom-attributes/helpers/config-helper';

class IbexaLinkFormView extends View {
Expand Down Expand Up @@ -271,7 +272,7 @@ class IbexaLinkFormView extends View {

config.choices.forEach((choice) => {
itemsList.add({
type: 'button',
type: config.multiple ? 'switchbutton' : 'button',
model: new Model({
withText: true,
label: choice,
Expand All @@ -282,8 +283,19 @@ class IbexaLinkFormView extends View {

addListToDropdown(labeledDropdown.fieldView, itemsList);

if (config.multiple) {
addMultivalueSupport(labeledDropdown, config);
}

this.listenTo(labeledDropdown.fieldView, 'execute', (event) => {
const value = this.getNewValue(event.source.value, config.multiple, labeledDropdown.fieldView.element.value);
const dropdownValue = labeledDropdown.fieldView.element.value;
const value = this.getNewValue(event.source.value, config.multiple, dropdownValue);

if (config.multiple) {
const isSelected = value.length > dropdownValue.length;

event.source.children.get(0).element.checked = isSelected;
}

labeledDropdown.fieldView.buttonView.set({
label: value,
Expand Down
99 changes: 96 additions & 3 deletions src/bundle/Resources/public/scss/_balloon-form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,104 @@
.ck.ck-dropdown {
border: calculateRem(1px) solid $ibexa-color-dark-200;
border-radius: calculateRem(5px);
width: 100%;

.ck-button.ck-dropdown__button {
.ck-button__label {
width: calculateRem(198px);
.ibexa-ckeditor-dropdown-selected-items {
display: flex;
align-items: center;
flex-wrap: nowrap;
width: calculateRem(198px);
overflow: hidden;
position: relative;

&__item {
display: inline-block;
white-space: nowrap;
background: $ibexa-color-light-300;
border: calculateRem(1px) solid $ibexa-color-light-300;
border-radius: $ibexa-border-radius;
margin-right: calculateRem(4px);
font-size: calculateRem(12px);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
font-size: calculateRem(12px);
font-size: $ibexa-text-font-size-small;

line-height: calculateRem(16px);
padding: 0 calculateRem(8px);
}
}

.ck-list {
padding: calculateRem(4px);

&__item {
border-radius: $ibexa-border-radius;

&:hover {
color: $ibexa-color-dark;
background-color: $ibexa-color-light-300;

.ck-button {
background-color: transparent;
}
}
}
}

.ck-button.ck-dropdown__button {
.ck-button {
&__label {
width: calculateRem(198px);
display: inline-block;
}
}
}

.ck-dropdown__panel--multiple {
.ck.ck-button {
&__toggle {
display: none;
}

.ibexa-ckeditor-input--checkbox {
appearance: none;
position: relative;
display: inline-block;
cursor: pointer;
outline: none;
border: calculateRem(1px) solid $ibexa-color-dark-300;
width: calculateRem(16px);
height: calculateRem(16px);
border-radius: calculateRem(2px);
margin-right: calculateRem(16px);

&::after {
content: ' ';
position: absolute;
top: calculateRem(3px);
left: calculateRem(3px);
display: block;
width: calculateRem(8px);
height: calculateRem(5px);
border-left: calculateRem(2px) solid transparent;
border-bottom: calculateRem(2px) solid transparent;
transform: rotate(-45deg);
}

&:hover {
border-color: $ibexa-color-primary;
}

&:focus {
border-color: $ibexa-color-primary;
box-shadow: 0 0 0 calculateRem(4px) rgba($ibexa-color-primary, 0.25);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will be the third use of such box-shadow i the project. What do you think about creating new shadow variable?

}

&:checked {
border-color: $ibexa-color-primary;
background-color: $ibexa-color-primary;

&::after {
border-color: $ibexa-color-white;
}
}
}
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/bundle/Resources/public/scss/_custom-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
width: 100%;

.ck.ck-button {
display: block;
display: flex;

.ck.ck-button__label {
.ck.ck-button__label,
.ibexa-ckeditor-dropdown-selected-items {
width: calc(100% - calculateRem(20px));
height: fit-content;
white-space: normal;
Expand Down
Loading