Skip to content

Commit 29d7599

Browse files
Merge remote-tracking branch 'origin/8.4' into 9.0
# Conflicts: # Build/Jenkins/update-neos-ui-compiled.sh # Classes/Controller/BackendController.php # README.md # Tests/IntegrationTests/TestDistribution/composer.json # composer.json # packages/neos-ui-views/src/NodeInfoView/index.js
2 parents 7b9554e + ecf2157 commit 29d7599

File tree

8 files changed

+27
-8
lines changed

8 files changed

+27
-8
lines changed

Build/Jenkins/update-neos-ui-compiled.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ cd tmp_compiled_pkg
5252
git add Resources/Public/
5353
git commit -m "Compile Neos UI - $GIT_SHA1" || true
5454

55-
if [[ "$GIT_BRANCH" == "origin/7.3" || "$GIT_BRANCH" == "origin/8.0" || "$GIT_BRANCH" == "origin/8.1" || "$GIT_BRANCH" == "origin/8.2" || "$GIT_BRANCH" == "origin/8.3" || "$GIT_BRANCH" == "origin/9.0" ]]; then
55+
if [[ "$GIT_BRANCH" == "origin/7.3" || "$GIT_BRANCH" == "origin/8.0" || "$GIT_BRANCH" == "origin/8.1" || "$GIT_BRANCH" == "origin/8.2" || "$GIT_BRANCH" == "origin/8.3" || "$GIT_BRANCH" == "origin/8.4" || "$GIT_BRANCH" == "origin/9.0" ]]; then
5656
echo "Git branch $GIT_BRANCH found, pushing to this branch."
5757
git push origin HEAD:${GIT_BRANCH#*/}
5858
fi

README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,21 @@ Release roadmap is [available here](https://www.neos.io/features/release-process
1111

1212
That means:
1313
* All bugfixes go to the lowest maintained branch
14-
* All new features go only to the 8.3 and 9.0 branch
14+
* All new features go only to the 8.4 and 9.0 branch
1515
* New minor and major releases are made in sync with Neos/Flow. Bugfix releases may be available independently
1616

17+
1718
### Currently maintained versions
1819

1920
* NeosCMS version 7.3: branch 7.3
2021
* NeosCMS version 8.0: branch 8.0
2122
* NeosCMS version 8.1: branch 8.1
2223
* NeosCMS version 8.2: branch 8.2
2324
* NeosCMS version 8.3: branch 8.3
25+
* NeosCMS version 8.3: branch 8.4
2426
* NeosCMS version 9.0: branch 9.0
25-
* latest development happens currently in the 8.3 and 9.0 branch
27+
* latest development happens currently in the 8.4 and 9.0 branch
28+
2629

2730
#### Releases with just security updates
2831

@@ -141,7 +144,9 @@ git checkout 8.2 && git fetch && git reset --hard origin/8.2 && git merge --no-f
141144
# review and `git commit`
142145
git checkout 8.3 && git fetch && git reset --hard origin/8.3 && git merge --no-ff --no-commit origin/8.2
143146
# review and `git commit`
144-
git checkout 9.0 && git fetch && git reset --hard origin/9.0 && git merge --no-ff --no-commit origin/8.3
147+
git checkout 8.4 && git fetch && git reset --hard origin/8.4 && git merge --no-ff --no-commit origin/8.3
148+
# review and `git commit`
149+
git checkout 9.0 && git fetch && git reset --hard origin/9.0 && git merge --no-ff --no-commit origin/8.4
145150
# review and `git commit`
146151
```
147152

packages/neos-ui-editors/src/Editors/Range/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ class RangeEditor extends PureComponent {
4141
handleChange = event => {
4242
const {options} = this.props;
4343
const {target} = event;
44+
const useParseInt = (options.step || 1) % 1 === 0;
4445

45-
let value = parseInt(target.value, 10);
46+
let value = useParseInt ? parseInt(target.value, 10) : parseFloat(target.value, 10);
4647
if (isNaN(value)) {
4748
return;
4849
}
@@ -64,6 +65,10 @@ class RangeEditor extends PureComponent {
6465
const options = {...this.constructor.defaultProps.options, ...this.props.options};
6566
const {value, highlight} = this.props;
6667
const valueAsString = value === 0 ? '0' : (value || '');
68+
// Calculate the width of the input field based on the length of the min, max and step values
69+
const numLength = value => value.toString().length;
70+
const additionalStepLength = numLength(options.step) - 1;
71+
const styleWidth = Math.max(numLength(options.min), numLength(options.max)) + additionalStepLength + 'ch';
6772

6873
return (
6974
<div
@@ -94,7 +99,7 @@ class RangeEditor extends PureComponent {
9499
onKeyPress={this.onKeyPress}
95100
onChange={this.handleChange}
96101
value={valueAsString}
97-
style={ {width: `${options.max.toString().length}ch`} }
102+
style={ {width: styleWidth} }
98103
disabled={options.disabled}
99104
/>
100105
{options.unit}

packages/neos-ui-views/src/NodeInfoView/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ export default class NodeInfoView extends PureComponent {
3636
};
3737

3838
const nodeType = node?.nodeType;
39+
// Insert soft hyphens after dots and colon to make the node type more readable
40+
const hyphenatedNodeTypeName = nodeType.replace(/([.:])/g, '$1\u00AD');
3941

4042
return (
4143
<ul className={style.nodeInfoView}>
@@ -65,7 +67,7 @@ export default class NodeInfoView extends PureComponent {
6567
</li>
6668
<li className={style.nodeInfoView__item} title={nodeType}>
6769
<div className={style.nodeInfoView__title}>{i18nRegistry.translate('type', 'Type', {}, 'Neos.Neos')}</div>
68-
<NodeInfoViewContent>{nodeType}</NodeInfoViewContent>
70+
<NodeInfoViewContent>{hyphenatedNodeTypeName}</NodeInfoViewContent>
6971
</li>
7072
</ul>
7173
);

packages/neos-ui-views/src/NodeInfoView/style.module.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@
3030
.nodeInfoView__content {
3131
font-size: 13px;
3232
color: var(--colors-ContrastBright);
33+
hyphenate-character: '';
34+
word-wrap: break-word;
3335
}

packages/neos-ui/src/Containers/RightSideBar/Inspector/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import style from './style.module.css';
3737
const shouldShowUnappliedChangesOverlay = isDirty && !shouldPromptToHandleUnappliedChanges;
3838
const shouldShowSecondaryInspector = selectors.UI.Inspector.shouldShowSecondaryInspector(state);
3939
const focusedNode = selectors.CR.Nodes.focusedSelector(state);
40-
const parentNode = selectors.CR.Nodes.nodeByContextPath(state)(focusedNode.parent);
40+
const parentNode = focusedNode ? selectors.CR.Nodes.nodeByContextPath(state)(focusedNode.parent) : null;
4141

4242
return {
4343
focusedNode,

packages/neos-ui/src/Containers/style.module.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,26 @@
5757
/* Scrollbar styles for appContainer, its siblings (needed for React portals) and also for contentcanvas' body */
5858
:global(#appContainer ::-webkit-scrollbar),
5959
:global(#appContainer ~ * ::-webkit-scrollbar),
60+
:global(#appContainer ~ *::-webkit-scrollbar),
6061
:global(body::-webkit-scrollbar) {
6162
width: 4px;
6263
height: 4px;
6364
}
6465
:global(#appContainer ::-webkit-scrollbar-track),
6566
:global(#appContainer ~ * ::-webkit-scrollbar-track),
67+
:global(#appContainer ~ *::-webkit-scrollbar-track),
6668
:global(body::-webkit-scrollbar-track) {
6769
background-color: transparent;
6870
}
6971
:global(#appContainer ::-webkit-scrollbar-thumb),
7072
:global(#appContainer ~ * ::-webkit-scrollbar-thumb),
73+
:global(#appContainer ~ *::-webkit-scrollbar-thumb),
7174
:global(body::-webkit-scrollbar-thumb) {
7275
background-color: var(--colors-ContrastBright);
7376
}
7477
:global(#appContainer ::-webkit-scrollbar-corner),
7578
:global(#appContainer ~ * ::-webkit-scrollbar-corner),
79+
:global(#appContainer ~ *::-webkit-scrollbar-corner),
7680
:global(body::-webkit-scrollbar-corner) {
7781
background-color: var(--colors-ContrastDark);
7882
}

packages/react-ui-components/src/Tooltip/style.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
background: var(--colors-ContrastDarkest);
3434
color: white;
3535
box-shadow: 0px 0px 10px rgba(125, 125, 125, .2);
36+
overflow-wrap: break-word;
3637
}
3738

3839
.tooltip--asError .tooltip--inner {

0 commit comments

Comments
 (0)