Skip to content

Commit b81bbb9

Browse files
committed
Move setting-context-pane to sdk
Signed-off-by: Zvonimir Fras <zvonimir@zvonimirfras.com>
1 parent 6a59850 commit b81bbb9

File tree

5 files changed

+31
-21
lines changed

5 files changed

+31
-21
lines changed

app/src/routes/edit/elements-pane.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ import { ChevronDown, ChevronUp } from '@carbon/react/icons';
1010
import Handlebars from 'handlebars';
1111
import parse from 'html-react-parser';
1212

13-
import { ElementTile, FragmentPreview, allComponents, FragmentLayoutWidget } from '@carbon-builder/sdk-react';
13+
import {
14+
ElementTile,
15+
FragmentPreview,
16+
allComponents,
17+
FragmentLayoutWidget,
18+
accordionButtonStyle
19+
} from '@carbon-builder/sdk-react';
1420
import { leftPane, leftPaneContent, leftPaneHeader } from '.';
1521
import { GlobalStateContext, useFragment } from '../../context';
1622
import { getEditScreenParams } from '../../utils/fragment-tools';
17-
import { accordionButtonStyle } from './settings-context-pane';
1823
import { useRemoteCustomComponentsCollections } from '../../utils/misc-tools';
1924

2025
const elementTileListStyleBase = css`

app/src/routes/edit/index.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import { ElementsPane } from './elements-pane';
3131
import { StylePane } from './style-pane';
3232
import { CodePane } from './code-pane';
3333

34-
import { SettingsContextPane } from './settings-context-pane';
3534
import { CodeContextPane } from './code-context-pane';
3635
import { useParams } from 'react-router-dom';
3736
import { useHotkeys } from 'react-hotkeys-hook';
3837
import {
3938
Fragment,
39+
SettingsContextPane,
4040
getParentComponent,
4141
getSelectedComponent,
4242
initializeIds,
@@ -191,7 +191,9 @@ export const Edit = () => {
191191
undoAction,
192192
redoAction,
193193
customComponentsCollections,
194-
styleClasses
194+
styleClasses,
195+
settings,
196+
setSettings
195197
} = useContext(GlobalStateContext);
196198
const [remoteCustomComponentsCollections] = useRemoteCustomComponentsCollections();
197199

@@ -339,7 +341,13 @@ export const Edit = () => {
339341
</TabList>
340342
<TabPanels>
341343
<TabPanel>
342-
<SettingsContextPane fragment={fragment} setFragment={updateFragment} />
344+
<SettingsContextPane
345+
fragment={fragment}
346+
setFragment={updateFragment}
347+
settings={settings}
348+
setSettings={setSettings}
349+
styleClasses={styleClasses}
350+
customComponentsCollections={customComponentsCollections} />
343351
</TabPanel>
344352
<TabPanel>
345353
<CodeContextPane fragment={fragment} setFragment={updateFragment} />

sdk/react/src/lib/components/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ export * from './fragment-layout-widget';
33
export * from './fragment-preview';
44
export * from './custom-components-collection-editor';
55
export * from './fragment';
6+
export * from './settings-context-pane';

app/src/routes/edit/selected-component-breadcrumbs.tsx renamed to sdk/react/src/lib/components/selected-component-breadcrumbs.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import React from 'react';
22

33
import { Breadcrumb, BreadcrumbItem } from '@carbon/react';
44

5-
import { useFragment } from '../../context';
65
import { css } from 'emotion';
7-
import { getParentComponent, getSelectedComponent } from '@carbon-builder/sdk-react';
6+
import { getParentComponent, getSelectedComponent } from '../..';
87

98
const getAncestors = (state: any, component: any) => {
109
const ancestors: any[] = [];
@@ -25,9 +24,7 @@ const getAncestors = (state: any, component: any) => {
2524
return ancestors;
2625
};
2726

28-
export const SelectedComponentBreadcrumbs = ({ selectedComponent }: any) => {
29-
const [fragment, setFragment] = useFragment();
30-
27+
export const SelectedComponentBreadcrumbs = ({ selectedComponent, fragment, setFragment }: any) => {
3128
if (!selectedComponent) {
3229
selectedComponent = getSelectedComponent(fragment);
3330
}

app/src/routes/edit/settings-context-pane.tsx renamed to sdk/react/src/lib/components/settings-context-pane.tsx

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useContext } from 'react';
1+
import React from 'react';
22
import {
33
Button,
44
Checkbox,
@@ -18,9 +18,8 @@ import {
1818
LayoutWidget,
1919
getSelectedComponent,
2020
updatedState
21-
} from '@carbon-builder/sdk-react';
21+
} from '../..';
2222
import { SelectedComponentBreadcrumbs } from './selected-component-breadcrumbs';
23-
import { GlobalStateContext } from '../../context';
2423

2524
const styleContextPaneStyle = css`
2625
.cds--form-item.cds--checkbox-wrapper {
@@ -160,15 +159,15 @@ const throttledSetComponent = throttle((component: any) => setComponent(componen
160159
let proxySetFragment = (_fragment: any) => console.log('proxySetFragment not inizialized yet');
161160
const throttledSetFragment = throttle((fragment: any) => proxySetFragment(fragment), 150);
162161

163-
export const SettingsContextPane = ({ fragment, setFragment }: any) => {
162+
export const SettingsContextPane = ({
163+
fragment,
164+
setFragment,
165+
settings,
166+
setSettings,
167+
styleClasses,
168+
customComponentsCollections
169+
}: any) => {
164170
const selectedComponent = getSelectedComponent(fragment);
165-
const {
166-
settings,
167-
setSettings,
168-
styleClasses,
169-
customComponentsCollections
170-
} = useContext(GlobalStateContext);
171-
172171
const updateContextPaneSettings = (s: any) => {
173172
setSettings({
174173
...settings,

0 commit comments

Comments
 (0)