Skip to content

Commit 2e5e91b

Browse files
authored
Merge pull request #38 from aeagle/fix/30-container-classname
Ensure multiple user classes are appended with -container for the out…
2 parents 6488d86 + df4a477 commit 2e5e91b

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

demo/src/ui-demo/CodeEditor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import './CodeEditor.scss';
66

77
export const CodeEditor = () => {
88
return (
9-
<Space.Fill className="code-editor">
9+
<Space.Fill className="code-editor code-editor-1">
1010
<Header />
1111
<Main />
1212
</Space.Fill>

react-spaces/src/Globals/Hooks.ts

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,29 @@ export const useSpace = (props: AllProps, divElementRef: React.MutableRefObject<
161161
const debug =
162162
parentContext ? parentContext.debug : false ||
163163
props.debug !== undefined ? props.debug : false;
164+
165+
const userClasses =
166+
props.className ?
167+
props.className.split(' ').map(c => c.trim()) :
168+
[];
164169

165-
const outerClasses = [
166-
"spaces-space",
167-
props.anchor || '',
168-
resize.resizeType || '',
169-
props.scrollable ? "scrollable" : '',
170-
props.className ? `${props.className}-container` : '',
171-
debug ? 'debug' : ''
172-
]
173-
174-
const innerClasses = [
175-
"spaces-space-inner",
176-
props.className ? props.className : ''
177-
]
170+
const outerClasses =
171+
[
172+
...[
173+
"spaces-space",
174+
props.anchor || undefined,
175+
resize.resizeType || undefined,
176+
props.scrollable ? "scrollable" : undefined,
177+
debug ? 'debug' : undefined
178+
],
179+
...userClasses.map(c => `${c}-container`)
180+
].filter(c => c);
181+
182+
const innerClasses =
183+
[
184+
"spaces-space-inner",
185+
...userClasses
186+
].filter(c => c);
178187

179188
return {
180189
currentContext,

0 commit comments

Comments
 (0)