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.

Sign up for GitHub

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

feat(icon-switch): design updates #2819

Merged
merged 16 commits into from
Sep 22, 2021
Merged

feat(icon-switch): design updates #2819

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e720b6d
fix(icon-switch): update design
kevinsperrine Sep 9, 2021
5667b9a
chore(icon-switch): update snapshots
kevinsperrine Sep 9, 2021
0399b88
fix(page-title-bar): don't apply margin to IconSwitch
kevinsperrine Sep 9, 2021
d8265a4
fix(icon-switch): fix styles for dividers between icons
kevinsperrine Sep 10, 2021
352a3af
chore(icon-switch): update snapshots
kevinsperrine Sep 10, 2021
d2b2d91
chore(icon-switch): clean up styles, add knobs to stories
kevinsperrine Sep 10, 2021
ed58719
fix(icon-switch): fix icon pixel move/rough border
kevinsperrine Sep 13, 2021
6a4ff06
fix(icon-switch): use psuedo-element for light selected borders
kevinsperrine Sep 14, 2021
1586401
fix(icon-switch): design updates for RTL
kevinsperrine Sep 14, 2021
7518289
Merge branch 'next' into 1536-icon-switch-style-updates
kevinsperrine Sep 14, 2021
487548c
fix(icon-switch): design adjustments from pr feedback
kevinsperrine Sep 15, 2021
a8c7c95
chore(repo): fix action
kevinsperrine Sep 15, 2021
4accbbe
Revert "chore(repo): fix action"
kevinsperrine Sep 15, 2021
94d0753
fix(icon-switch): thicken focus borders
kevinsperrine Sep 16, 2021
9527c6e
fix(icon-switch): hide dividers on hover
kevinsperrine Sep 20, 2021
3073310
fix(icon-switch): hide divider beside selected icon
kevinsperrine Sep 20, 2021
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
138 changes: 123 additions & 15 deletions packages/react/src/components/DashboardEditor/__snapshots__/DashboardEditor.story.storyshot
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion ...react/src/components/HotspotEditorModal/HotspotTextStyleTab/HotspotTextStyleTab.story.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import merge from 'lodash/merge';
import { action } from '@storybook/addon-actions';
import { withKnobs } from '@storybook/addon-knobs';
import { boolean, withKnobs } from '@storybook/addon-knobs';
import {
purple70,
cyan50,
Expand Down Expand Up @@ -50,6 +50,7 @@ const colors = [
];

export const Default = () => {
const isLight = boolean('light', true);
const WithState = () => {
const [formValues, setFormValues] = useState({});

Expand All @@ -73,6 +74,7 @@ export const Default = () => {
action('onDelete')(change);
}}
translateWithId={() => {}}
light={isLight}
/>
);
};
Expand Down
30 changes: 24 additions & 6 deletions .../HotspotEditorModal/HotspotTextStyleTab/__snapshots__/HotspotTextStyleTab.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
<button
aria-describedby={null}
aria-pressed={null}
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--light iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
data-testid="hotspot-bold"
disabled={false}
onBlur={[Function]}
Expand All @@ -42,6 +42,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
>
Text Bold
</div>
<span
className="iot--icon-switch__divider"
/>
<svg
aria-hidden="true"
aria-label="Text Bold"
Expand All @@ -63,7 +66,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
<button
aria-describedby={null}
aria-pressed={null}
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--light iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
data-testid="hotspot-italic"
disabled={false}
onBlur={[Function]}
Expand All @@ -81,6 +84,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
>
Text Italic
</div>
<span
className="iot--icon-switch__divider"
/>
<svg
aria-hidden="true"
aria-label="Text Italic"
Expand All @@ -102,7 +108,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
<button
aria-describedby={null}
aria-pressed={null}
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--light iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
data-testid="hotspot-underline"
disabled={false}
onBlur={[Function]}
Expand All @@ -120,6 +126,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
>
Text Underline
</div>
<span
className="iot--icon-switch__divider"
/>
<svg
aria-hidden="true"
aria-label="Text Underline"
Expand Down Expand Up @@ -698,7 +707,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
<button
aria-describedby={null}
aria-pressed={null}
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--light iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
data-testid="hotspot-bold"
disabled={false}
onBlur={[Function]}
Expand All @@ -716,6 +725,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
>
Text Bold
</div>
<span
className="iot--icon-switch__divider"
/>
<svg
aria-hidden="true"
aria-label="Text Bold"
Expand All @@ -737,7 +749,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
<button
aria-describedby={null}
aria-pressed={null}
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--light iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
data-testid="hotspot-italic"
disabled={false}
onBlur={[Function]}
Expand All @@ -755,6 +767,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
>
Text Italic
</div>
<span
className="iot--icon-switch__divider"
/>
<svg
aria-hidden="true"
aria-label="Text Italic"
Expand All @@ -776,7 +791,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
<button
aria-describedby={null}
aria-pressed={null}
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
className="iot--icon-switch iot--icon-switch--default iot--icon-switch--light iot--icon-switch--unselected iot--icon-switch--unselected--light bx--btn bx--btn--secondary bx--tooltip--hidden bx--btn--icon-only bx--tooltip__trigger bx--tooltip--a11y bx--btn--icon-only--top bx--tooltip--align-center"
data-testid="hotspot-underline"
disabled={false}
onBlur={[Function]}
Expand All @@ -794,6 +809,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
>
Text Underline
</div>
<span
className="iot--icon-switch__divider"
/>
<svg
aria-hidden="true"
aria-label="Text Underline"
Expand Down
15 changes: 14 additions & 1 deletion packages/react/src/components/IconSwitch/IconSwitch.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const IconSwitch = React.forwardRef((props, ref) => {
text,
light,
testId,
children,
...other
} = props;

Expand All @@ -53,6 +54,8 @@ const IconSwitch = React.forwardRef((props, ref) => {
className,
`${iotPrefix}--icon-switch`,
`${iotPrefix}--icon-switch--${size}`,
{ [`${iotPrefix}--icon-switch--selected`]: selected },
{ [`${iotPrefix}--icon-switch--light`]: light },
{ [`${iotPrefix}--icon-switch--unselected`]: !selected },
{ [`${iotPrefix}--icon-switch--unselected--light`]: light && !selected }
);
Expand All @@ -74,7 +77,10 @@ const IconSwitch = React.forwardRef((props, ref) => {
data-testid={testId}
{...other}
{...commonProps}
/>
>
{children}
<span className={`${iotPrefix}--icon-switch__divider`} />
</CarbonButton>
);
});

Expand Down Expand Up @@ -143,6 +149,11 @@ IconSwitch.propTypes = {
light: PropTypes.bool,

testId: PropTypes.string,

/** The button should be disabled */
disabled: PropTypes.bool,

children: PropTypes.node,
};

IconSwitch.defaultProps = {
Expand All @@ -154,6 +165,8 @@ IconSwitch.defaultProps = {
onClick: undefined,
onKeyDown: undefined,
testId: 'icon-switch',
disabled: false,
children: undefined,
};

export default IconSwitch;
Loading