From 51d7cd9a0b43cf59105c4f1d5cd7e6ec4541aa7c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 8 Jun 2020 07:51:16 +0200 Subject: [PATCH] Remove Button divider (#2899) --- .../react-components/src/Button/Divider.tsx | 17 -------------- .../react-components/src/Button/Group.tsx | 22 ++++--------------- .../react-components/src/Button/index.tsx | 2 -- packages/react-components/src/Button/types.ts | 7 +----- 4 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 packages/react-components/src/Button/Divider.tsx diff --git a/packages/react-components/src/Button/Divider.tsx b/packages/react-components/src/Button/Divider.tsx deleted file mode 100644 index f2c7833075..0000000000 --- a/packages/react-components/src/Button/Divider.tsx +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2017-2020 @polkadot/react-components authors & contributors -// This software may be modified and distributed under the terms -// of the Apache-2.0 license. See the LICENSE file for details. - -import { DividerProps } from './types'; - -import React from 'react'; - -import { classes } from '../util'; - -function ButtonDivider ({ className = '' }: DividerProps): React.ReactElement { - return ( -
- ); -} - -export default React.memo(ButtonDivider); diff --git a/packages/react-components/src/Button/Group.tsx b/packages/react-components/src/Button/Group.tsx index 91feb3cee3..530ae9af63 100644 --- a/packages/react-components/src/Button/Group.tsx +++ b/packages/react-components/src/Button/Group.tsx @@ -2,32 +2,26 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { GroupProps, GroupType } from './types'; +import { GroupProps } from './types'; import React from 'react'; import SUIButton from 'semantic-ui-react/dist/commonjs/elements/Button/Button'; import styled from 'styled-components'; -import Divider from './Divider'; - function ButtonGroup ({ children, className = '', isBasic, isCentered }: GroupProps): React.ReactElement { return ( -
+
- {isBasic - ? null - : - } {children}
); } -const Memo = React.memo(styled(ButtonGroup)` +export default React.memo(styled(ButtonGroup)` text-align: right; :not(:first-child) { @@ -46,12 +40,4 @@ const Memo = React.memo(styled(ButtonGroup)` &+.ui--Table { margin-top: 1.5rem; } - - .ui--Buttn-Group-Divider { - padding: 0; - } -`) as unknown as GroupType; - -Memo.Divider = Divider; - -export default Memo; +`); diff --git a/packages/react-components/src/Button/index.tsx b/packages/react-components/src/Button/index.tsx index ac92878038..f71288a691 100644 --- a/packages/react-components/src/Button/index.tsx +++ b/packages/react-components/src/Button/index.tsx @@ -6,13 +6,11 @@ import { ButtonType } from './types'; import IButton from './Button'; import Content from './Content'; -import Divider from './Divider'; import Group from './Group'; const Button = IButton as unknown as ButtonType; Button.Content = Content; -Button.Divider = Divider; Button.Group = Group; export default Button; diff --git a/packages/react-components/src/Button/types.ts b/packages/react-components/src/Button/types.ts index 05d4fee1ad..9dcb0f5040 100644 --- a/packages/react-components/src/Button/types.ts +++ b/packages/react-components/src/Button/types.ts @@ -46,13 +46,8 @@ export interface GroupProps extends BareProps { isCentered?: boolean; } -export type GroupType = React.ComponentType & { - Divider: React.ComponentType; -}; - export type ButtonType = React.ComponentType & { Content: React.ComponentType; - Divider: React.ComponentType; - Group: GroupType; + Group: React.ComponentType; Or: React.ComponentType; };