Skip to content

updates in dropdown #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
muhammadzeeshansaqib merged 2 commits into from
Apr 3, 2025
Merged

updates in dropdown #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34ed0f2
updates in dropdown
muhammadzeeshansaqib Apr 3, 2025
0a07167
updates in dropdownmenu
muhammadzeeshansaqib Apr 3, 2025
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: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
61 changes: 35 additions & 26 deletions src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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' }
]
},
{
Expand All @@ -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' }
]
}
]
}
}
7 changes: 4 additions & 3 deletions src/lib/pixel-drop-dow-menu/pixel-drop-down-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -150,7 +151,7 @@ export const PixelDropDownMenu = React.forwardRef<HTMLDivElement, MenuProps>(
(
{
className,
toggleText = 'drop-down-button',
toggleText = 'new',
options,
active,
variant = 'simple',
Expand Down Expand Up @@ -183,7 +184,7 @@ export const PixelDropDownMenu = React.forwardRef<HTMLDivElement, MenuProps>(
{...rest}
>
{variant === 'tag' ? (
<PixelTag>{toggleText}</PixelTag>
<DcTag>{toggleText}</DcTag>
) : (
<React.Fragment>{toggleText}</React.Fragment>
)}
Expand Down Expand Up @@ -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)`
Expand Down
Loading