Skip to content

Commit 3ffebf0

Browse files
Merge branch 'support-slds-2' into fix-issues-with-external-app
2 parents a498bec + bf33bee commit 3ffebf0

File tree

8 files changed

+8
-12
lines changed

8 files changed

+8
-12
lines changed

src/scripts/Button.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export type ButtonType =
1313
| 'success'
1414
| 'inverse'
1515
| 'icon'
16-
| 'icon-bare'
1716
| 'icon-container'
1817
| 'icon-inverse'
1918
| 'icon-more'

src/scripts/Datepicker.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,9 @@ const DatepickerDate: FC<DatepickerDateProps> = (props) => {
246246
const isToday = date.value === today;
247247
const isAdjacentMonth = date.month !== cal.month;
248248
const dateClassName = classnames({
249-
'slds-disabled-text': !enabled,
250249
'slds-is-selected': selected,
251250
'slds-is-today': isToday,
252-
'slds-day_adjacent-month': isAdjacentMonth,
251+
'slds-day_adjacent-month': isAdjacentMonth || !enabled, // Considering the meaning, applying this class to disabled dates isn't necesarrily correct.
253252
});
254253
return (
255254
<td

src/scripts/Icon.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,7 @@ export const SvgIcon = forwardRef(
201201

202202
const inIcon = !/slds-button__icon/.test(className);
203203
const iconOnlyClassNames = classnames('react-slds-icon', 'slds-icon', {
204-
[`slds-icon_${size}`]: /^(xx-small|x-small|small|medium|large)$/.test(
205-
size
206-
),
204+
[`slds-icon_${size}`]: /^(xx-small|x-small|small|large)$/.test(size),
207205
[`slds-icon-text-${textColor ?? 'default'}`]:
208206
/^(default|success|warning|error|light)$/.test(textColor ?? '') &&
209207
!iconColor,

src/scripts/Pill.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export const Pill: FC<PillProps> = (props) => {
8686
<Button
8787
disabled={disabled}
8888
className='slds-pill__remove'
89-
type='icon-bare'
89+
type='icon'
9090
icon='close'
9191
alt='Remove'
9292
tabIndex={-1}

src/scripts/Tabs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ const TabMenu: FC<TabMenuProps> = (props) => {
9999
{...rprops}
100100
className='react-slds-tab-menu'
101101
icon={icon}
102-
type='icon-bare'
102+
type='icon'
103103
iconSize='small'
104104
tabIndex={-1}
105105
nubbinTop

src/scripts/TreeNode.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const TreeNodeItem: FC<TreeNodeProps & { icon?: string }> = (props) => {
8686
<Button
8787
className='slds-m-right_x-small'
8888
aria-controls=''
89-
type='icon-bare'
89+
type='icon'
9090
icon={icon}
9191
iconSize='small'
9292
onClick={onToggle}

stories/DropdownButton.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export const IconBare: StoryObj<StoryProps> = {
130130
args: {
131131
...Default.args,
132132
label: undefined,
133-
type: 'icon-bare',
133+
type: 'icon',
134134
icon: 'settings',
135135
},
136136
parameters: {

stories/PageHeader.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export const RecordHome: ComponentStoryObj<typeof PageHeader> = {
8888
<PageHeaderDetailItem>
8989
<PageHeaderDetailLabel>
9090
Field 2 (3)
91-
<DropdownButton type='icon-bare' iconSize='small' icon='down'>
91+
<DropdownButton type='icon' iconSize='small' icon='down'>
9292
<MenuItem>Menu Item #1</MenuItem>
9393
<MenuItem>Menu Item #2</MenuItem>
9494
<MenuItem>Menu Item #3</MenuItem>
@@ -124,7 +124,7 @@ export const ObjectHome: ComponentStoryObj<typeof PageHeader> = {
124124
legend='Leads'
125125
title='Recently Viewed'
126126
leftActions={
127-
<DropdownButton type='icon-bare' icon='down'>
127+
<DropdownButton type='icon' icon='down'>
128128
<MenuItem>Menu Item #1</MenuItem>
129129
<MenuItem>Menu Item #2</MenuItem>
130130
<MenuItem>Menu Item #3</MenuItem>

0 commit comments

Comments
 (0)