Skip to content
This repository has been archived by the owner on Mar 4, 2020. It is now read-only.

fix(Dialog|Segment): update support of color prop #1702

Merged
merged 4 commits into from
Jul 22, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Fixes
- Fix `ChatMessage`'s focus border overlays `actionMenu` in Teams theme @mnajdova ([#1637](https://github.com/stardust-ui/react/pull/1637))
- Add `color` prop to `Segment` typings @layershifter ([#1702](https://github.com/stardust-ui/react/pull/1702))
- Remove `color` prop from `Dialog` typings @layershifter ([#1702](https://github.com/stardust-ui/react/pull/1702))

### Documentation
- Make sidebar categories collapsible @lucivpav ([#1611](https://github.com/stardust-ui/react/pull/1611))
Expand Down
5 changes: 1 addition & 4 deletions packages/react/src/components/Dialog/Dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import * as React from 'react'
import {
UIComponentProps,
commonPropTypes,
ColorComponentProps,
ContentComponentProps,
AutoControlledComponent,
doesNodeContainClick,
Expand All @@ -32,8 +31,7 @@ export interface DialogSlotClassNames {

export interface DialogProps
extends UIComponentProps,
ContentComponentProps<ShorthandValue<BoxProps>>,
ColorComponentProps {
ContentComponentProps<ShorthandValue<BoxProps>> {
/** Accessibility behavior if overridden by the user. */
accessibility?: Accessibility

Expand Down Expand Up @@ -105,7 +103,6 @@ class Dialog extends AutoControlledComponent<WithAsProp<DialogProps>, DialogStat
...commonPropTypes.createCommon({
children: false,
content: 'shorthand',
color: true,
}),
actions: customPropTypes.itemShorthand,
headerAction: customPropTypes.itemShorthand,
Expand Down
3 changes: 3 additions & 0 deletions packages/react/src/components/Segment/Segment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
ChildrenComponentProps,
commonPropTypes,
rtlTextContainer,
ColorComponentProps,
} from '../../lib'
import { Accessibility } from '../../lib/accessibility/types'

Expand All @@ -17,6 +18,7 @@ import Box, { BoxProps } from '../Box/Box'
export interface SegmentProps
extends UIComponentProps<SegmentProps>,
ChildrenComponentProps,
ColorComponentProps,
ContentComponentProps<ShorthandValue<BoxProps>> {
/**
* Accessibility behavior if overridden by the user.
Expand All @@ -38,6 +40,7 @@ class Segment extends UIComponent<WithAsProp<SegmentProps>, any> {
static propTypes = {
...commonPropTypes.createCommon({
content: 'shorthand',
color: true,
}),
disabled: PropTypes.bool,
inverted: PropTypes.bool,
Expand Down