Skip to content

Fix (Global Colors): fix dragging in color picker #3590

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
bfintal merged 2 commits into from
Sep 17, 2025
Merged

Fix (Global Colors): fix dragging in color picker #3590

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
7702cee
fix dragging
kaeizen Sep 10, 2025
646a6d4
fix Coderabbit's QA
kaeizen Sep 16, 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
9 changes: 5 additions & 4 deletions src/components/sortable-picker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import {
Dashicon,
Dropdown,
} from '@wordpress/components'
import { useState, useEffect } from '@wordpress/element'
import {
useState, useEffect, forwardRef,
} from '@wordpress/element'
import { __ } from '@wordpress/i18n'
import { ResetButton } from '../base-control2/reset-button'

Expand All @@ -43,7 +45,7 @@ const DRAG_KEYCODES = {
down: [ 40, 39 ],
}

const SortablePicker = props => {
const SortablePicker = forwardRef( ( props, ref ) => {
const {
nonSortableItems = [],
editableName = true,
Expand All @@ -54,7 +56,6 @@ const SortablePicker = props => {
handleAddItem,
onSortEnd,
AddItemPopover = null,
ref,
enableAddItem = true,
} = props
const [ isSorting, setIsSorting ] = useState( false )
Expand Down Expand Up @@ -133,7 +134,7 @@ const SortablePicker = props => {
</div>
</BaseControl>
)
}
} )

SortablePicker.defaultProps = {
className: '',
Expand Down
28 changes: 14 additions & 14 deletions src/plugins/global-settings/colors/color-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,19 @@ import { ColorIndicator, ColorPicker } from '@wordpress/components'

let saveTimeout = null

const ItemPickerColor = ( { item, onChange } ) => {
return <div className="stk-color-palette-control__popover-content">
<ColorPicker
onChange={ value => onChange( {
...item,
color: value,
} ) }
color={ item.color }
enableAlpha={ true }
/>
</div>
}

const ColorPickers = props => {
const ref = useRef()
const {
Expand Down Expand Up @@ -134,19 +147,6 @@ const ColorPickers = props => {
/>
}

const ItemPicker = ( { item, onChange } ) => {
return <div className="stk-color-palette-control__popover-content">
<ColorPicker
onChange={ value => onChange( {
...item,
color: value,
} ) }
color={ item.color }
enableAlpha={ true }
/>
</div>
}

return (
<SortablePicker
ref={ ref }
Expand All @@ -157,7 +157,7 @@ const ColorPickers = props => {
handleAddItem={ handleAddIcon }
onSortEnd={ onSortEnd }
ItemPreview={ ItemPreview }
ItemPicker={ ItemPicker }
ItemPicker={ ItemPickerColor }
{ ...props }
/>
)
Expand Down
Loading