diff --git a/package.json b/package.json index c857c9d..6e64b93 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixel-base", - "version": "1.9.0", + "version": "1.9.1", "description": "Common UI components for web.pixelone.app, Based on React Bootstrap", "author": "muffrank", "license": "MIT", diff --git a/src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.stories.tsx b/src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.stories.tsx index ef0c79e..02d794c 100644 --- a/src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.stories.tsx +++ b/src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.stories.tsx @@ -26,14 +26,13 @@ Simple.args = { margin: '10px', padding: '20px', tooltip: 'string', - toggleText: 'Dropdown', + toggleText: 'completed', options: [ - { label: 'Child 2', clickHandler: () => { console.log('testing') - }, + } }, { label: 'Child 3' @@ -85,13 +84,14 @@ Grouped.args = { children: [ { - label: 'Test 1', clickHandler: () => { + label: 'Test 1', + clickHandler: () => { console.log('testing') - }, + } }, { label: 'Test 2' }, { label: 'Test 323' }, - { label: 'Test 12323' }, + { label: 'Test 12323' } ] }, { @@ -100,80 +100,89 @@ Grouped.args = { { label: 'Test 321' }, { label: 'Test 13232' }, { label: 'Test dfd1' }, - { label: 'Test 1fdf' }, + { label: 'Test 1fdf' } ] }, { - label: 'Child 4', children: [ - { label: 'Test 1' }, + label: 'Child 4', + children: [ { label: 'Test 1' }, { label: 'Test 1' }, { label: 'Test 1' }, + { label: 'Test 1' } ] }, { - label: 'Child 5', children: [ - { label: 'Test 1' }, + label: 'Child 5', + children: [ { label: 'Test 1' }, { label: 'Test 1' }, { label: 'Test 1' }, + { label: 'Test 1' } ] }, { - label: 'Child 6', children: [ - { label: 'Test 1' }, + label: 'Child 6', + children: [ { label: 'Test 1' }, { label: 'Test 1' }, { label: 'Test 1' }, + { label: 'Test 1' } ] }, { - label: 'Child 7', children: [ - { label: 'Test 1' }, + label: 'Child 7', + children: [ { label: 'Test 1' }, { label: 'Test 1' }, { label: 'Test 1' }, + { label: 'Test 1' } ] }, { - label: 'Child 8', children: [ - { label: 'Test 1' }, + label: 'Child 8', + children: [ { label: 'Test 1' }, { label: 'Test 1' }, { label: 'Test 1' }, + { label: 'Test 1' } ] }, { - label: 'Child 9', children: [ - { label: 'Test 1' }, + label: 'Child 9', + children: [ { label: 'Test 1' }, { label: 'Test 1' }, { label: 'Test 1' }, + { label: 'Test 1' } ] }, { - label: 'Child 10', children: [ - { label: 'Test 1' }, + label: 'Child 10', + children: [ { label: 'Test 1' }, { label: 'Test 1' }, { label: 'Test 1' }, + { label: 'Test 1' } ] }, { - label: 'Child 11', children: [ - { label: 'Test 1' }, + label: 'Child 11', + children: [ { label: 'Test 1' }, { label: 'Test 1' }, { label: 'Test 1' }, + { label: 'Test 1' } ] }, { - label: 'Child 12', children: [ - { label: 'Test 1' }, + label: 'Child 12', + children: [ { label: 'Test 1' }, { label: 'Test 1' }, { label: 'Test 1' }, + { label: 'Test 1' } ] } ] -} \ No newline at end of file +} diff --git a/src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.tsx b/src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.tsx index f3340e9..8f00434 100644 --- a/src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.tsx +++ b/src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.tsx @@ -3,6 +3,7 @@ import { Dropdown } from 'react-bootstrap' import styled, { css } from 'styled-components' import { $DCprimaryColor, $DCprimaryActiveColor } from '../styleGuide' import { PixelTag } from '../pixel-tag/pixel-tag' +import DcTag from '../dc-tag/dc-tag' export interface MenuProps { className?: string variant?: 'outline' | 'simple' | 'secondary' | 'link' | 'tag' | string @@ -150,7 +151,7 @@ export const PixelDropDownMenu = React.forwardRef( ( { className, - toggleText = 'drop-down-button', + toggleText = 'new', options, active, variant = 'simple', @@ -183,7 +184,7 @@ export const PixelDropDownMenu = React.forwardRef( {...rest} > {variant === 'tag' ? ( - {toggleText} + {toggleText} ) : ( {toggleText} )} @@ -262,7 +263,7 @@ const StyledSubDropdown = styled(Dropdown)` ` const DropdownMenu = styled(Dropdown.Menu)` - max-width: 200px; + max-width: 400px; inset: 0px 0px auto auto !important; ` const DropdownMenuSub = styled(Dropdown.Menu)`