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.

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

FEATURE: add ButtonEditor as new editor #3475

Open
wants to merge 2 commits into
base: 9.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
157 changes: 157 additions & 0 deletions packages/neos-ui-editors/src/Editors/Button/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {Icon, IconButton} from '@neos-project/react-ui-components';
import style from './style.module.css';

import {neos} from '@neos-project/neos-ui-decorators';
import {$transform} from 'plow-js';
reflexxion marked this conversation as resolved.
Show resolved Hide resolved
import {connect} from 'react-redux';
import {selectors} from '@neos-project/neos-ui-redux-store';

const getDataLoaderOptionsForProps = props => ({
contextNodePath: props.focusedNodePath,
dataSourceIdentifier: props.options.dataSourceIdentifier,
dataSourceUri: props.options.dataSourceUri,
dataSourceAdditionalData: props.options.dataSourceAdditionalData,
dataSourceDisableCaching: Boolean(props.options.dataSourceDisableCaching)
});

@neos(globalRegistry => ({
i18nRegistry: globalRegistry.get('i18n'),
dataSourcesDataLoader: globalRegistry.get('dataLoaders').get('DataSources')
}))
@connect($transform({
focusedNodePath: selectors.CR.Nodes.focusedNodePathSelector
}))
reflexxion marked this conversation as resolved.
Show resolved Hide resolved
export default class ButtonEditor extends Component {
static propTypes = {
commit: PropTypes.func.isRequired,
value: PropTypes.any,
className: PropTypes.string,
options: PropTypes.shape({
allowEmpty: PropTypes.bool,
multiple: PropTypes.bool,
disabled: PropTypes.bool,
values: PropTypes.objectOf(PropTypes.shape({
label: PropTypes.string,
icon: PropTypes.string,
iconActive: PropTypes.string,
disabled: PropTypes.bool
})),

dataSourceIdentifier: PropTypes.string,
dataSourceUri: PropTypes.string,
dataSourceDisableCaching: PropTypes.bool,
dataSourceAdditionalData: PropTypes.objectOf(PropTypes.any)
}).isRequired,

i18nRegistry: PropTypes.object.isRequired
};

static defaultOptions = {
allowEmpty: false,
multiple: false,
disabled: false
};

state = {
active: [],
isLoading: false,
buttons: []
};

initialValueType = 'string';

constructor(props) {
super(props);

const {commit, options, value} = props;
this.initialValueType = Array.isArray(value) ? 'array' : 'string';
if (options.multiple && this.initialValueType === 'string') {
console.warn(`Misconfiguration in property "${props.identifier}". Multiple is activated but value type seems to be "string" but should be "array".`);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Imho this can be more aggressive. The editor should probably actually render this error message instead of the buttons :)

Though for the constraint check, it should not rely on analyzing the actual type of the value, but the configured type of the property (since it states "Misconfiguration").

An erroneous type of the property value should be handled gracefully by the editor.

AFAIK, the UI does not provide the configured type to the editors, but we should definitely change that. So hang on for a PR 😄, I'll see what I can do.

Copy link
Member

Choose a reason for hiding this comment

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

Seems to go into the direction of #3580?


this.state = {
active: Array.isArray(value) ? value : (value ? [value] : []),
buttons: this.hasDataSource() ? [] : this.flattenValues(options.values)
};
this.commit = commit;
}

hasDataSource() {
return this.props.options.dataSourceIdentifier || this.props.options.dataSourceUri;
}

componentDidMount() {
if (this.hasDataSource()) {
this.loadOptions();
}
}

loadOptions() {
this.setState({isLoading: true});
this.props.dataSourcesDataLoader.resolveValue(getDataLoaderOptionsForProps(this.props), this.props.value)
.then(buttons => {
this.setState({
isLoading: false,
buttons
});
});
reflexxion marked this conversation as resolved.
Show resolved Hide resolved
}

flattenValues(values) {
reflexxion marked this conversation as resolved.
Show resolved Hide resolved
return Object.entries(values).map(([key, val]) => {
return {...val, value: key, label: this.props.i18nRegistry.translate(val.label)};
});
}
reflexxion marked this conversation as resolved.
Show resolved Hide resolved

toggleActive(toggleValue) {
reflexxion marked this conversation as resolved.
Show resolved Hide resolved
const {multiple, allowEmpty} = this.props.options;
// we'd like to have a copy instead of ref
let active = [...this.state.active];
if (multiple === false) {
if (active.includes(toggleValue)) {
active = [];
} else {
active = [toggleValue];
}
} else if (active.includes(toggleValue)) {
active.splice(active.indexOf(toggleValue), 1);
} else {
active.push(toggleValue);
}

// if allowEmpty is false but new active length will be 0, drop changes
if (!allowEmpty && active.length === 0) {
return;
}
this.setState({active});

this.commit(this.initialValueType === 'string' ? active[0] || '' : active);
}

isActive(val) {
return this.state.active.includes(val);
}
reflexxion marked this conversation as resolved.
Show resolved Hide resolved

render() {
const options = Object.assign({}, this.constructor.defaultOptions, this.props.options);

return (<div className={style.buttonEditor}>
reflexxion marked this conversation as resolved.
Show resolved Hide resolved
{
this.state.isLoading
? <Icon icon="spinner" size="lg" spin/>
: this.state.buttons.map((button) => (<IconButton
style="lighter"
reflexxion marked this conversation as resolved.
Show resolved Hide resolved
hoverStyle="darken"
className={style.button}
icon={button.iconActive ? (this.isActive(button.value) ? button.iconActive : button.icon) : button.icon}
title={button.label}
disabled={options.disabled || button.disabled}
isActive={this.isActive(button.value)}
onClick={this.toggleActive.bind(this, button.value)}
/>))
}
</div>);
}
}
8 changes: 8 additions & 0 deletions packages/neos-ui-editors/src/Editors/Button/style.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.buttonEditor {
}

.buttonEditor .button {
margin-right: var(--spacing-Quarter);
margin-top: var(--spacing-Quarter);
font-size: 20px;
}
reflexxion marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 3 additions & 1 deletion packages/neos-ui-editors/src/Editors/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import MasterPlugin from './MasterPlugin/index';
import PluginViews from './PluginViews/index';
import PluginView from './PluginView/index';
import UriPathSegment from './UriPathSegment/index';
import ButtonEditor from './Button/index';

export {
TextField,
Expand All @@ -35,5 +36,6 @@ export {
MasterPlugin,
PluginViews,
PluginView,
UriPathSegment
UriPathSegment,
ButtonEditor
};
5 changes: 4 additions & 1 deletion packages/neos-ui-editors/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import {
AssetEditor,
PluginViews,
PluginView,
UriPathSegment
UriPathSegment,
ButtonEditor
} from './Editors/index';

import {
Expand Down Expand Up @@ -58,6 +59,7 @@ export {
PluginViews,
PluginView,
UriPathSegment,
ButtonEditor,

CodeMirrorWrap,
CKEditorWrap,
Expand Down Expand Up @@ -93,6 +95,7 @@ export default {
PluginViews,
PluginView,
UriPathSegment,
ButtonEditor,

CodeMirrorWrap,
CKEditorWrap,
Expand Down
4 changes: 4 additions & 0 deletions packages/neos-ui-editors/src/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ manifest('inspectorEditors', {}, globalRegistry => {
component: Editors.UriPathSegment
});

editorsRegistry.set('Neos.Neos/Inspector/Editors/ButtonEditor', {
component: Editors.ButtonEditor
});

//
// Secondary inspector editors
//
Expand Down