From 0dbfba92fc7c75348ac7d419e872a3ee72c0f0e8 Mon Sep 17 00:00:00 2001 From: Oleksandr Fediashov Date: Mon, 22 Jul 2019 16:37:56 +0200 Subject: [PATCH 1/2] fix(Dialog|Segment): update support of `color` prop --- packages/react/src/components/Dialog/Dialog.tsx | 5 +---- packages/react/src/components/Segment/Segment.tsx | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react/src/components/Dialog/Dialog.tsx b/packages/react/src/components/Dialog/Dialog.tsx index f044415256..781928bb19 100644 --- a/packages/react/src/components/Dialog/Dialog.tsx +++ b/packages/react/src/components/Dialog/Dialog.tsx @@ -7,7 +7,6 @@ import * as React from 'react' import { UIComponentProps, commonPropTypes, - ColorComponentProps, ContentComponentProps, AutoControlledComponent, doesNodeContainClick, @@ -32,8 +31,7 @@ export interface DialogSlotClassNames { export interface DialogProps extends UIComponentProps, - ContentComponentProps>, - ColorComponentProps { + ContentComponentProps> { /** Accessibility behavior if overridden by the user. */ accessibility?: Accessibility @@ -105,7 +103,6 @@ class Dialog extends AutoControlledComponent, DialogStat ...commonPropTypes.createCommon({ children: false, content: 'shorthand', - color: true, }), actions: customPropTypes.itemShorthand, headerAction: customPropTypes.itemShorthand, diff --git a/packages/react/src/components/Segment/Segment.tsx b/packages/react/src/components/Segment/Segment.tsx index f5349a8f59..b6e7f50023 100644 --- a/packages/react/src/components/Segment/Segment.tsx +++ b/packages/react/src/components/Segment/Segment.tsx @@ -8,6 +8,7 @@ import { ChildrenComponentProps, commonPropTypes, rtlTextContainer, + ColorComponentProps, } from '../../lib' import { Accessibility } from '../../lib/accessibility/types' @@ -17,6 +18,7 @@ import Box, { BoxProps } from '../Box/Box' export interface SegmentProps extends UIComponentProps, ChildrenComponentProps, + ColorComponentProps, ContentComponentProps> { /** * Accessibility behavior if overridden by the user. @@ -38,6 +40,7 @@ class Segment extends UIComponent, any> { static propTypes = { ...commonPropTypes.createCommon({ content: 'shorthand', + color: true, }), disabled: PropTypes.bool, inverted: PropTypes.bool, From dab053a0b34716e11297e64429e29da7f40f2322 Mon Sep 17 00:00:00 2001 From: Oleksandr Fediashov Date: Mon, 22 Jul 2019 16:45:36 +0200 Subject: [PATCH 2/2] add changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 755e0f9120..899eda93c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,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))