Skip to content

Commit a82c796

Browse files
markhickenmarkhicken
authored
Merge pull request #103 from adobe/PDCL-12761-styles-fixed
Upgrade react-spectrum, fix button and icon styles
2 parents 3f13dea + db4b23c commit a82c796

File tree

12 files changed

+74
-53
lines changed

12 files changed

+74
-53
lines changed

‎package-lock.json

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
]
4242
},
4343
"dependencies": {
44-
"@adobe/react-spectrum": "^3.14.1",
44+
"@adobe/react-spectrum": "^3.37.1",
4545
"@adobe/reactor-babel-plugin-replace-tokens-edge": "^1.1.0",
4646
"@adobe/reactor-bridge": "^11.0.1",
4747
"@adobe/reactor-extension-core-edge": "^1.1.3",

‎src/app/Home.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default () => {
4545
history.push(NAMED_ROUTES.VIEW_SANDBOX);
4646
}}
4747
>
48-
<ViewSandboxIcon />
48+
<ViewSandboxIcon marginEnd="size-50" />
4949
<Text>Go to View Sandbox</Text>
5050
</Button>
5151

@@ -57,7 +57,7 @@ export default () => {
5757
history.push(NAMED_ROUTES.LIB_SANDBOX);
5858
}}
5959
>
60-
<LibrarySandboxIcon />
60+
<LibrarySandboxIcon marginEnd="size-50" />
6161
<Text>Go to Library Sandbox</Text>
6262
</Button>
6363
)}

‎src/app/components/Menu.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const Menu = ({ location }) => {
103103
>
104104
{({ key, textValue, Icon }) => (
105105
<Item key={key} textValue={textValue}>
106-
<Icon />
106+
<Icon marginStart="size-200" marginEnd="size-50" />
107107
<Text>{textValue}</Text>
108108
</Item>
109109
)}

‎src/app/libSandboxEdge/components/ControlTabs.jsx

+8-4
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,16 @@ export default ({ extensionDescriptor, onRequestResponseReceived, onSendRequest,
9898
<Flex justifyContent="center">
9999
<TabList position="relative" bottom="-0.1rem">
100100
<Item key="xdm">
101-
<FileXML />
102-
<Text>XDM</Text>
101+
<Flex alignItems="center">
102+
<FileXML size="S" marginEnd="size-50" />
103+
<Text>XDM</Text>
104+
</Flex>
103105
</Item>
104106
<Item key="request">
105-
<FileJson />
106-
<Text>Request</Text>
107+
<Flex alignItems="center">
108+
<FileJson size="S" marginEnd="size-50" />
109+
<Text>Request</Text>
110+
</Flex>
107111
</Item>
108112
</TabList>
109113
</Flex>

‎src/app/libSandboxWeb/components/RightColumn.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default ({ templateLocation, isLatestTemplate }) => {
6262
history.push(NAMED_ROUTES.LIBRARY_EDITOR);
6363
}}
6464
>
65-
<Draw />
65+
<Draw marginEnd="size-50" />
6666
<Text>Go to Library Editor</Text>
6767
</Button>
6868
</>
@@ -98,7 +98,7 @@ export default ({ templateLocation, isLatestTemplate }) => {
9898
history.push(NAMED_ROUTES.LIBRARY_EDITOR);
9999
}}
100100
>
101-
<Draw />
101+
<Draw marginEnd="size-50" />
102102
<Text>Go to Library Editor</Text>
103103
</Button>
104104
</>

‎src/app/libraryEditor/components/List.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ const List = ({ items, nameProperty, keyName, deleteFn, heading = 'Unknows' }) =
6363
}
6464
>
6565
<Item key="edit" textValue="edit">
66-
<Edit />
66+
<Edit marginStart="size-200" />
6767
<Text>Edit</Text>
6868
</Item>
6969
<Item key="delete" textValue="delete">
70-
<Delete />
70+
<Delete marginStart="size-200" />
7171
<Text>Delete</Text>
7272
</Item>
7373
</ActionGroup>
@@ -91,7 +91,7 @@ const List = ({ items, nameProperty, keyName, deleteFn, heading = 'Unknows' }) =
9191
marginTop="size-150"
9292
onPress={() => history.push(`${url}${url.endsWith('/') ? '' : '/'}new`)}
9393
>
94-
<Add />
94+
<Add marginEnd="size-50" />
9595
<Text>Add</Text>
9696
</Button>
9797
</View>

‎src/app/libraryEditor/components/Menu.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default () => {
4141
}, []);
4242

4343
return (
44-
<Flex direction="column" height="100%" width="size-3000">
44+
<Flex direction="column" height="100%" width="size-3200">
4545
<View borderEndWidth="thin" borderEndColor="gray-400" height="100%" padding="size-200">
4646
<ActionGroup
4747
isQuiet
@@ -61,26 +61,26 @@ export default () => {
6161
key={`${NAMED_ROUTES.LIBRARY_EDITOR}/extension_configurations`}
6262
textValue="Extension Configuration"
6363
>
64-
<ExtenionConfigurationIcon />
64+
<ExtenionConfigurationIcon marginStart="size-100" marginEnd="size-50" />
6565
<Text>Extension Configurations</Text>
6666
</Item>
6767
<Item key={`${NAMED_ROUTES.LIBRARY_EDITOR}/data_elements`} textValue="Data Elements">
68-
<DataElementsIcon />
68+
<DataElementsIcon marginStart="size-100" marginEnd="size-50" />
6969
<Text>Data Elements</Text>
7070
</Item>
7171
<Item key={`${NAMED_ROUTES.LIBRARY_EDITOR}/rules`} textValue="Rules">
72-
<RuleIcon />
72+
<RuleIcon marginStart="size-100" marginEnd="size-50" />
7373
<Text>Rules</Text>
7474
</Item>
7575
<Item
7676
key={`${NAMED_ROUTES.LIBRARY_EDITOR}/property_settings`}
7777
textValue="Property Settings"
7878
>
79-
<PropertySettingsIcon />
79+
<PropertySettingsIcon marginStart="size-100" marginEnd="size-50" />
8080
<Text>Property Settings</Text>
8181
</Item>
8282
<Item key={`${NAMED_ROUTES.LIBRARY_EDITOR}/settings`} textValue="Settings">
83-
<SettingsIcon />
83+
<SettingsIcon marginStart="size-100" marginEnd="size-50" />
8484
<Text>Settings</Text>
8585
</Item>
8686
</ActionGroup>

‎src/app/libraryEditor/components/RuleComponentCard.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ export default ({ item, type, index, handleDeleteClick }) => {
6363
>
6464
<TooltipTrigger>
6565
<Item key="edit" textValue="edit">
66-
<Edit />
66+
<Edit marginEnd="size-50" />
6767
</Item>
6868
<Tooltip>Edit Component</Tooltip>
6969
</TooltipTrigger>
7070
<TooltipTrigger>
7171
<Item key="delete" textValue="delete">
72-
<Delete />
72+
<Delete marginEnd="size-50" />
7373
</Item>
7474
<Tooltip>Delete Component</Tooltip>
7575
</TooltipTrigger>

‎src/app/libraryEditor/components/RuleComponentsList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default ({ items, type, handleDeleteClick, addLabel = 'Add' }) => {
5656
}}
5757
marginTop="size-150"
5858
>
59-
<Add />
59+
<Add marginEnd="size-50" />
6060
<Text>{addLabel}</Text>
6161
</ActionButton>
6262
</>

‎src/app/libraryEditor/components/RuleEdit.js

+30-24
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export default () => {
152152
/>
153153

154154
{extensionDescriptor.platform !== PLATFORMS.EDGE && (
155-
<>
155+
<View paddingY="size-100">
156156
<Heading level={3}>Events</Heading>
157157
<RuleComponentsList
158158
addLabel="Add new event"
@@ -164,31 +164,37 @@ export default () => {
164164
items={rule.events || []}
165165
type="events"
166166
/>
167-
</>
167+
</View>
168168
)}
169169

170-
<Heading level={3}>Conditions</Heading>
171-
<RuleComponentsList
172-
addLabel="Add new condition"
173-
handleDeleteClick={handleDeleteClick({
174-
rule,
175-
setRule,
176-
setCurrentRule: dispatch.currentRule.setCurrentRule
177-
})}
178-
items={rule.conditions || []}
179-
type="conditions"
180-
/>
181-
<Heading level={3}>Actions</Heading>
182-
<RuleComponentsList
183-
addLabel="Add new action"
184-
handleDeleteClick={handleDeleteClick({
185-
rule,
186-
setRule,
187-
setCurrentRule: dispatch.currentRule.setCurrentRule
188-
})}
189-
items={rule.actions || []}
190-
type="actions"
191-
/>
170+
<View paddingY="size-100">
171+
<Heading level={3}>Conditions</Heading>
172+
<RuleComponentsList
173+
addLabel="Add new condition"
174+
handleDeleteClick={handleDeleteClick({
175+
rule,
176+
setRule,
177+
setCurrentRule: dispatch.currentRule.setCurrentRule
178+
})}
179+
items={rule.conditions || []}
180+
type="conditions"
181+
/>
182+
</View>
183+
184+
<View paddingY="size-100">
185+
<Heading level={3}>Actions</Heading>
186+
<RuleComponentsList
187+
addLabel="Add new action"
188+
handleDeleteClick={handleDeleteClick({
189+
rule,
190+
setRule,
191+
setCurrentRule: dispatch.currentRule.setCurrentRule
192+
})}
193+
items={rule.actions || []}
194+
type="actions"
195+
/>
196+
</View>
197+
192198
<Divider marginTop="size-300" />
193199
<ButtonGroup marginTop="size-150" marginBottom="size-150">
194200
<Button

‎src/app/viewSandbox/components/ControlTabs.jsx

+12-6
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,22 @@ export default ({
118118
<Flex justifyContent="center">
119119
<TabList position="relative" bottom="-0.1rem">
120120
<Item key="init" textValue="Init">
121-
<BoxImport />
122-
<Text>Init</Text>
121+
<Flex alignItems="center">
122+
<BoxImport size="S" marginEnd="size-50" />
123+
<Text>Init</Text>
124+
</Flex>
123125
</Item>
124126
<Item key="settings" textValue="Get settings">
125-
<BoxExport />
126-
<Text>Get Settings</Text>
127+
<Flex alignItems="center">
128+
<BoxExport size="S" marginEnd="size-50" />
129+
<Text>Get Settings</Text>
130+
</Flex>
127131
</Item>
128132
<Item key="validate" textValue="Validate">
129-
<AlertCheck />
130-
<Text>Validate</Text>
133+
<Flex alignItems="center">
134+
<AlertCheck size="S" marginEnd="size-50" />
135+
<Text>Validate</Text>
136+
</Flex>
131137
</Item>
132138
</TabList>
133139
</Flex>

0 commit comments

Comments
 (0)