From bc0732e617d842e243d495f8c3c137ff3e9301b2 Mon Sep 17 00:00:00 2001 From: Piotr Nalepa Date: Fri, 10 May 2019 12:15:37 +0200 Subject: [PATCH] fixup --- Resources/public/scss/modules/udw/_main.scss | 2 ++ .../select.content.button.component.js | 4 ++-- .../common/selected-content/selected.content.component.js | 4 ++-- src/modules/udw/tabs/browse/browse.tab.module.js | 4 ++-- .../components/finder/finder.tree.branch.component.js | 4 ++-- .../browse/components/finder/finder.tree.leaf.component.js | 6 +++--- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Resources/public/scss/modules/udw/_main.scss b/Resources/public/scss/modules/udw/_main.scss index e5b3c217..d67a8f36 100644 --- a/Resources/public/scss/modules/udw/_main.scss +++ b/Resources/public/scss/modules/udw/_main.scss @@ -1,3 +1,5 @@ +@import './tabs/main'; + .ez-udw-module { .c-popup__body { padding: calculateRem(16px); diff --git a/src/modules/udw/common/select-content-button/select.content.button.component.js b/src/modules/udw/common/select-content-button/select.content.button.component.js index 91deb2cc..952a86c2 100644 --- a/src/modules/udw/common/select-content-button/select.content.button.component.js +++ b/src/modules/udw/common/select-content-button/select.content.button.component.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useCallback } from 'react'; import PropTypes from 'prop-types'; import Icon from '../../../common/icon/icon'; -import { classnames } from '../../../common/classnames/classnames'; +import { createCssClassNames } from '../../../common/css-class-names/css.class.names'; const SelectContentButtonComponent = ({ checkCanSelectContent, location, onSelect, onDeselect, isSelected }) => { const [isSelectContentEnabled, setIsSelectContentEnabled] = useState(true); @@ -39,7 +39,7 @@ const SelectContentButtonComponent = ({ checkCanSelectContent, location, onSelec const iconId = isSelected ? 'checkmark' : 'create'; const attrs = { type: 'button', - className: classnames({ + className: createCssClassNames({ 'c-select-content-button': true, 'c-select-content-button--selected': isSelected, }), diff --git a/src/modules/udw/common/selected-content/selected.content.component.js b/src/modules/udw/common/selected-content/selected.content.component.js index 95f44b7a..49c9cef8 100644 --- a/src/modules/udw/common/selected-content/selected.content.component.js +++ b/src/modules/udw/common/selected-content/selected.content.component.js @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; import SelectedContentItemComponent from './selected.content.item.component'; import PopupComponent from '../../../common/tooltip-popup/tooltip.popup.component'; -import { classnames } from '../../../common/classnames/classnames'; +import { createCssClassNames } from '../../../common/css-class-names/css.class.names'; const noConfirmedContentTitle = Translator.trans( /*@Desc("No confirmed content yet")*/ 'select_content.no_confirmed_content.title', @@ -67,7 +67,7 @@ const SelectedContentComponent = ({ items, itemsLimit, onItemRemove }) => { ); }; const titles = items.map((item) => item.ContentInfo.Content.Name).join(', '); - const btnClassNames = classnames({ + const btnClassNames = createCssClassNames({ 'c-selected-content__info': true, 'c-selected-content__info--any-item-selected': !!itemsCount, }); diff --git a/src/modules/udw/tabs/browse/browse.tab.module.js b/src/modules/udw/tabs/browse/browse.tab.module.js index fb2b90cc..cfa45149 100644 --- a/src/modules/udw/tabs/browse/browse.tab.module.js +++ b/src/modules/udw/tabs/browse/browse.tab.module.js @@ -4,7 +4,7 @@ import TabContentPanelComponent from '../../common/tab-content-panel/tab.content import FinderComponent from './components/finder/finder.component'; import ContentMetaPreviewComponent from '../../common/content-meta-preview/content.meta.preview.component'; import SelectedContentComponent from '../../common/selected-content/selected.content.component'; -import { classnames } from '../../../common/classnames/classnames'; +import { createCssClassNames } from '../../../common/css-class-names/css.class.names'; import BaseTabComponent from '../base.tab.component'; const UDWBrowseTab = ({ selectedItemsLimit, onCancel, onConfirm, ...props }) => { @@ -35,7 +35,7 @@ const UDWBrowseTab = ({ selectedItemsLimit, onCancel, onConfirm, ...props }) => onItemRemove: unmarkContentAsSelected, }; const tabAttrs = { - className: classnames({ + className: createCssClassNames({ 'ez-browse-tab': true, 'ez-browse-tab--with-preview': !!contentMeta, }), diff --git a/src/modules/udw/tabs/browse/components/finder/finder.tree.branch.component.js b/src/modules/udw/tabs/browse/components/finder/finder.tree.branch.component.js index 6c83bb6d..9341b57d 100644 --- a/src/modules/udw/tabs/browse/components/finder/finder.tree.branch.component.js +++ b/src/modules/udw/tabs/browse/components/finder/finder.tree.branch.component.js @@ -2,7 +2,7 @@ import React, { useContext, useCallback } from 'react'; import PropTypes from 'prop-types'; import { ContentTypesContext } from '../../../../udw.module'; import FinderTreeLeafComponent from './finder.tree.leaf.component'; -import { classnames } from '../../../../../common/classnames/classnames'; +import { createCssClassNames } from '../../../../../common/css-class-names/css.class.names'; const TEXT_LOAD_MORE = Translator.trans(/*@Desc("Load more")*/ 'finder.branch.load_more.label', {}, 'universal_discovery_widget'); @@ -51,7 +51,7 @@ const FinderTreeBranchComponent = (props) => { }; const wrapperAttrs = { - className: classnames({ + className: createCssClassNames({ 'c-finder-tree-branch': true, 'c-finder-tree-branch--collapsed': !items.length, }), diff --git a/src/modules/udw/tabs/browse/components/finder/finder.tree.leaf.component.js b/src/modules/udw/tabs/browse/components/finder/finder.tree.leaf.component.js index 43dd1eee..5b8393cf 100644 --- a/src/modules/udw/tabs/browse/components/finder/finder.tree.leaf.component.js +++ b/src/modules/udw/tabs/browse/components/finder/finder.tree.leaf.component.js @@ -4,7 +4,7 @@ import SelectContentButtonComponent from '../../../../common/select-content-butt import LoadingSpinnerComponent from '../../../../../common/loading-spinner/loading.spinner.component'; import Icon from '../../../../../common/icon/icon'; import { ContentTypesContext } from '../../../../udw.module'; -import { classnames } from '../../../../../common/classnames/classnames'; +import { createCssClassNames } from '../../../../../common/css-class-names/css.class.names'; const FinderTreeLeafComponent = (props) => { const { location, isSelectable, onClick, isMarked, isLoadingChildren } = props; @@ -35,7 +35,7 @@ const FinderTreeLeafComponent = (props) => { } const contentTypeIconUrl = window.eZ.helpers.contentType.getContentTypeIconUrl(contentTypeIdentifier); - const extraClasses = classnames({ + const extraClasses = createCssClassNames({ 'ez-icon--small': true, 'ez-icon--light': isMarked, }); @@ -71,7 +71,7 @@ const FinderTreeLeafComponent = (props) => { const isForcedLocation = allowedLocations.length === 1; const wrapperAttrs = { - className: classnames({ + className: createCssClassNames({ 'c-finder-tree-leaf': true, 'c-finder-tree-leaf--selected': isMarked, 'c-finder-tree-leaf--not-selectable': !isSelectable || isForcedLocation,