playbook_ui 15.6.0 → 15.7.0.pre.rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/pb_kits/playbook/pb_card/docs/_card_header.md +1 -1
- data/app/pb_kits/playbook/pb_card/docs/_card_highlight.md +1 -1
- data/app/pb_kits/playbook/pb_collapsible/__snapshots__/collapsible.test.js.snap +2 -2
- data/app/pb_kits/playbook/pb_collapsible/child_kits/CollapsibleIcon.tsx +10 -8
- data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_icons.jsx +0 -1
- data/app/pb_kits/playbook/pb_collapsible/docs/_collapsible_state.jsx +0 -3
- data/app/pb_kits/playbook/pb_date_picker/date_picker.test.js +24 -0
- data/app/pb_kits/playbook/pb_date_picker/date_picker_helper.ts +181 -3
- data/app/pb_kits/playbook/pb_distribution_bar/docs/_distribution_bar_custom_colors.md +1 -1
- data/app/pb_kits/playbook/pb_draggable/context/index.tsx +316 -15
- data/app/pb_kits/playbook/pb_draggable/context/types.ts +1 -1
- data/app/pb_kits/playbook/pb_radio/docs/_radio_error.md +1 -1
- data/app/pb_kits/playbook/pb_select/_select.tsx +8 -3
- data/app/pb_kits/playbook/pb_select/docs/_select_error.md +1 -1
- data/app/pb_kits/playbook/pb_select/docs/_select_input_options.html.erb +16 -0
- data/app/pb_kits/playbook/pb_select/docs/_select_input_options.jsx +30 -0
- data/app/pb_kits/playbook/pb_select/docs/_select_input_options.md +1 -0
- data/app/pb_kits/playbook/pb_select/docs/example.yml +2 -0
- data/app/pb_kits/playbook/pb_select/docs/index.js +1 -0
- data/app/pb_kits/playbook/pb_select/select.html.erb +2 -2
- data/app/pb_kits/playbook/pb_select/select.rb +3 -1
- data/app/pb_kits/playbook/pb_select/select.test.js +23 -0
- data/app/pb_kits/playbook/pb_text_input/docs/_text_input_error.md +1 -1
- data/app/pb_kits/playbook/pb_textarea/docs/_textarea_error.md +1 -1
- data/app/pb_kits/playbook/tokens/_colors.scss +2 -1
- data/dist/chunks/_typeahead-CYNrKU10.js +6 -0
- data/dist/chunks/lib-DDDLiZuu.js +29 -0
- data/dist/chunks/vendor.js +2 -2
- data/dist/playbook-rails-react-bindings.js +1 -1
- data/dist/playbook-rails.js +1 -1
- data/dist/playbook.css +1 -1
- data/lib/playbook/forms/builder/collection_select_field.rb +9 -1
- data/lib/playbook/forms/builder/select_field.rb +9 -1
- data/lib/playbook/forms/builder/time_zone_select_field.rb +9 -1
- data/lib/playbook/version.rb +2 -2
- metadata +7 -4
- data/dist/chunks/_typeahead-DecTL7bt.js +0 -6
- data/dist/chunks/lib-Dk4GKPut.js +0 -29
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { createContext, useReducer, useContext, useEffect, useMemo } from "react";
|
|
1
|
+
import React, { createContext, useReducer, useContext, useEffect, useMemo, useRef } from "react";
|
|
2
2
|
import { InitialStateType, ActionType, DraggableProviderType } from "./types";
|
|
3
3
|
|
|
4
4
|
const initialState: InitialStateType = {
|
|
@@ -92,6 +92,35 @@ const reducer = (state: InitialStateType, action: ActionType) => {
|
|
|
92
92
|
return { ...state, items: newItems };
|
|
93
93
|
}
|
|
94
94
|
|
|
95
|
+
// Reset item back to its original container and position (e.g., when drag ends without valid drop)
|
|
96
|
+
case "RESET_DRAG_CONTAINER": {
|
|
97
|
+
const { itemId, originalContainer, originalIndex } = action.payload;
|
|
98
|
+
const newItems = [...state.items];
|
|
99
|
+
const draggedItem = newItems.find(item => item && item.id === itemId);
|
|
100
|
+
|
|
101
|
+
if (!draggedItem) return state;
|
|
102
|
+
|
|
103
|
+
const currentIndex = newItems.indexOf(draggedItem);
|
|
104
|
+
|
|
105
|
+
// Remove from current position
|
|
106
|
+
newItems.splice(currentIndex, 1);
|
|
107
|
+
|
|
108
|
+
// Restore container property and insert at original index
|
|
109
|
+
const restoredItem = { ...draggedItem, container: originalContainer };
|
|
110
|
+
|
|
111
|
+
// Insert at original index, or at end if index is invalid
|
|
112
|
+
if (originalIndex !== undefined && originalIndex >= 0) {
|
|
113
|
+
newItems.splice(originalIndex, 0, restoredItem);
|
|
114
|
+
} else {
|
|
115
|
+
newItems.push(restoredItem);
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
return {
|
|
119
|
+
...state,
|
|
120
|
+
items: newItems
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
|
|
95
124
|
default:
|
|
96
125
|
return state;
|
|
97
126
|
}
|
|
@@ -119,6 +148,29 @@ export const DraggableProvider = ({
|
|
|
119
148
|
enableCrossContainerPreview = false,
|
|
120
149
|
}: DraggableProviderType) => {
|
|
121
150
|
const [state, dispatch] = useReducer(reducer, initialState);
|
|
151
|
+
|
|
152
|
+
// Track drag state for global listener
|
|
153
|
+
const dragStateRef = useRef<{
|
|
154
|
+
isDragging: boolean;
|
|
155
|
+
draggedItemId: string;
|
|
156
|
+
originalContainer: string;
|
|
157
|
+
originalIndex: number;
|
|
158
|
+
currentContainer: string;
|
|
159
|
+
dropOccurred: boolean;
|
|
160
|
+
}>({
|
|
161
|
+
isDragging: false,
|
|
162
|
+
draggedItemId: '',
|
|
163
|
+
originalContainer: '',
|
|
164
|
+
originalIndex: -1,
|
|
165
|
+
currentContainer: '',
|
|
166
|
+
dropOccurred: false,
|
|
167
|
+
});
|
|
168
|
+
|
|
169
|
+
// Track current state for use in gated event listeners (avoid stale closures)
|
|
170
|
+
const stateRef = useRef(state);
|
|
171
|
+
useEffect(() => {
|
|
172
|
+
stateRef.current = state;
|
|
173
|
+
}, [state]);
|
|
122
174
|
|
|
123
175
|
// Parse dropZone prop - handle both string format (backward compatibility) and object format
|
|
124
176
|
let dropZoneType = 'ghost';
|
|
@@ -148,7 +200,209 @@ export const DraggableProvider = ({
|
|
|
148
200
|
onReorder(state.items);
|
|
149
201
|
}, [state.items]);
|
|
150
202
|
|
|
203
|
+
// Monitor for failed drops by detecting mouse/pointer release during drag (this is needed for cross container preview)
|
|
204
|
+
useEffect(() => {
|
|
205
|
+
if (!enableCrossContainerPreview) return;
|
|
206
|
+
|
|
207
|
+
// Allow drops anywhere on the document by preventing default dragover
|
|
208
|
+
const handleGlobalDragOver = (e: DragEvent) => {
|
|
209
|
+
if (dragStateRef.current.isDragging) {
|
|
210
|
+
e.preventDefault();
|
|
211
|
+
}
|
|
212
|
+
};
|
|
213
|
+
|
|
214
|
+
// Handle drops anywhere on the document (including non-container areas)
|
|
215
|
+
const handleGlobalDrop = (e: DragEvent) => {
|
|
216
|
+
if (!dragStateRef.current.isDragging) return;
|
|
217
|
+
|
|
218
|
+
// If a container already handled the drop, don't process again
|
|
219
|
+
if (dragStateRef.current.dropOccurred) return;
|
|
220
|
+
|
|
221
|
+
e.preventDefault();
|
|
222
|
+
|
|
223
|
+
// If we reach here, it means the drop was NOT on a valid container
|
|
224
|
+
// (otherwise the container's handleDrop would have set dropOccurred = true)
|
|
225
|
+
// So we should ALWAYS reset to original container for invalid drops
|
|
226
|
+
const originalContainer = dragStateRef.current.originalContainer;
|
|
227
|
+
|
|
228
|
+
dispatch({
|
|
229
|
+
type: 'RESET_DRAG_CONTAINER',
|
|
230
|
+
payload: {
|
|
231
|
+
itemId: dragStateRef.current.draggedItemId,
|
|
232
|
+
originalContainer: originalContainer,
|
|
233
|
+
originalIndex: dragStateRef.current.originalIndex,
|
|
234
|
+
},
|
|
235
|
+
});
|
|
236
|
+
|
|
237
|
+
dispatch({ type: 'SET_IS_DRAGGING', payload: "" });
|
|
238
|
+
dispatch({ type: 'SET_ACTIVE_CONTAINER', payload: "" });
|
|
239
|
+
dispatch({ type: 'SET_DRAG_DATA', payload: { id: "", initialGroup: "", originId: "" } });
|
|
240
|
+
|
|
241
|
+
// Clear drag state
|
|
242
|
+
dragStateRef.current = {
|
|
243
|
+
isDragging: false,
|
|
244
|
+
draggedItemId: '',
|
|
245
|
+
originalContainer: '',
|
|
246
|
+
originalIndex: -1,
|
|
247
|
+
currentContainer: '',
|
|
248
|
+
dropOccurred: false,
|
|
249
|
+
};
|
|
250
|
+
};
|
|
251
|
+
|
|
252
|
+
const handleGlobalMouseUp = () => {
|
|
253
|
+
// If we're dragging and mouse is released, wait a bit to see if drop occurs
|
|
254
|
+
if (dragStateRef.current.isDragging) {
|
|
255
|
+
setTimeout(() => {
|
|
256
|
+
const currentContainer = dragStateRef.current.currentContainer;
|
|
257
|
+
|
|
258
|
+
// If drop still hasn't occurred, check if item is in a different container
|
|
259
|
+
if (dragStateRef.current.isDragging && !dragStateRef.current.dropOccurred) {
|
|
260
|
+
// If item is in a different container than original, treat it as a successful drop
|
|
261
|
+
if (currentContainer && currentContainer !== dragStateRef.current.originalContainer) {
|
|
262
|
+
// Trigger onDrop callback with the current container
|
|
263
|
+
if (onDrop) {
|
|
264
|
+
const draggedItem = stateRef.current.items.find(item => item && item.id === dragStateRef.current.draggedItemId);
|
|
265
|
+
const updatedItem = draggedItem ? { ...draggedItem, container: currentContainer } : null;
|
|
266
|
+
const itemsInContainer = stateRef.current.items.filter(item => item && item.container === currentContainer);
|
|
267
|
+
const indexInContainer = itemsInContainer.findIndex(item => item && item.id === dragStateRef.current.draggedItemId);
|
|
268
|
+
const itemAbove = indexInContainer > 0 ? itemsInContainer[indexInContainer - 1] : null;
|
|
269
|
+
const itemBelow = indexInContainer < itemsInContainer.length - 1 ? itemsInContainer[indexInContainer + 1] : null;
|
|
270
|
+
|
|
271
|
+
onDrop(
|
|
272
|
+
dragStateRef.current.draggedItemId,
|
|
273
|
+
currentContainer,
|
|
274
|
+
dragStateRef.current.originalContainer,
|
|
275
|
+
updatedItem,
|
|
276
|
+
itemAbove,
|
|
277
|
+
itemBelow
|
|
278
|
+
);
|
|
279
|
+
}
|
|
280
|
+
} else {
|
|
281
|
+
dispatch({
|
|
282
|
+
type: 'RESET_DRAG_CONTAINER',
|
|
283
|
+
payload: {
|
|
284
|
+
itemId: dragStateRef.current.draggedItemId,
|
|
285
|
+
originalContainer: dragStateRef.current.originalContainer,
|
|
286
|
+
originalIndex: dragStateRef.current.originalIndex,
|
|
287
|
+
},
|
|
288
|
+
});
|
|
289
|
+
}
|
|
290
|
+
dispatch({ type: 'SET_IS_DRAGGING', payload: "" });
|
|
291
|
+
dispatch({ type: 'SET_ACTIVE_CONTAINER', payload: "" });
|
|
292
|
+
dispatch({ type: 'SET_DRAG_DATA', payload: { id: "", initialGroup: "", originId: "" } });
|
|
293
|
+
|
|
294
|
+
// Clear drag state
|
|
295
|
+
dragStateRef.current = {
|
|
296
|
+
isDragging: false,
|
|
297
|
+
draggedItemId: '',
|
|
298
|
+
originalContainer: '',
|
|
299
|
+
originalIndex: -1,
|
|
300
|
+
currentContainer: '',
|
|
301
|
+
dropOccurred: false,
|
|
302
|
+
};
|
|
303
|
+
}
|
|
304
|
+
}, 50); // Small delay to let drop event fire if it's going to
|
|
305
|
+
}
|
|
306
|
+
};
|
|
307
|
+
|
|
308
|
+
// Detect when drag leaves document boundaries
|
|
309
|
+
const handleDragLeave = (e: DragEvent) => {
|
|
310
|
+
// Check if we're leaving the document (relatedTarget will be null)
|
|
311
|
+
if (!e.relatedTarget && dragStateRef.current.isDragging && !dragStateRef.current.dropOccurred) {
|
|
312
|
+
// Drag left the document: reset to original container immediately
|
|
313
|
+
dispatch({
|
|
314
|
+
type: 'RESET_DRAG_CONTAINER',
|
|
315
|
+
payload: {
|
|
316
|
+
itemId: dragStateRef.current.draggedItemId,
|
|
317
|
+
originalContainer: dragStateRef.current.originalContainer,
|
|
318
|
+
originalIndex: dragStateRef.current.originalIndex,
|
|
319
|
+
},
|
|
320
|
+
});
|
|
321
|
+
dispatch({ type: 'SET_IS_DRAGGING', payload: "" });
|
|
322
|
+
dispatch({ type: 'SET_ACTIVE_CONTAINER', payload: "" });
|
|
323
|
+
dispatch({ type: 'SET_DRAG_DATA', payload: { id: "", initialGroup: "", originId: "" } });
|
|
324
|
+
|
|
325
|
+
// Clear drag state
|
|
326
|
+
dragStateRef.current = {
|
|
327
|
+
isDragging: false,
|
|
328
|
+
draggedItemId: '',
|
|
329
|
+
originalContainer: '',
|
|
330
|
+
originalIndex: -1,
|
|
331
|
+
currentContainer: '',
|
|
332
|
+
dropOccurred: false,
|
|
333
|
+
};
|
|
334
|
+
}
|
|
335
|
+
};
|
|
336
|
+
|
|
337
|
+
document.addEventListener('dragover', handleGlobalDragOver);
|
|
338
|
+
document.addEventListener('drop', handleGlobalDrop);
|
|
339
|
+
document.addEventListener('dragleave', handleDragLeave);
|
|
340
|
+
document.addEventListener('mouseup', handleGlobalMouseUp);
|
|
341
|
+
document.addEventListener('pointerup', handleGlobalMouseUp);
|
|
342
|
+
|
|
343
|
+
return () => {
|
|
344
|
+
document.removeEventListener('dragover', handleGlobalDragOver);
|
|
345
|
+
document.removeEventListener('drop', handleGlobalDrop);
|
|
346
|
+
document.removeEventListener('dragleave', handleDragLeave);
|
|
347
|
+
document.removeEventListener('mouseup', handleGlobalMouseUp);
|
|
348
|
+
document.removeEventListener('pointerup', handleGlobalMouseUp);
|
|
349
|
+
};
|
|
350
|
+
}, [enableCrossContainerPreview]);
|
|
351
|
+
|
|
352
|
+
// Detect when dragging stops (isDragging goes from truthy to empty)
|
|
353
|
+
const prevIsDraggingRef = useRef(state.isDragging);
|
|
354
|
+
|
|
355
|
+
useEffect(() => {
|
|
356
|
+
if (!enableCrossContainerPreview) return;
|
|
357
|
+
|
|
358
|
+
const wasDragging = prevIsDraggingRef.current;
|
|
359
|
+
const isNowDragging = state.isDragging;
|
|
360
|
+
|
|
361
|
+
// Drag just ended (was dragging, now not)
|
|
362
|
+
if (wasDragging && !isNowDragging) {
|
|
363
|
+
|
|
364
|
+
// If drop didn't occur, reset to original container
|
|
365
|
+
if (!dragStateRef.current.dropOccurred && dragStateRef.current.draggedItemId) {
|
|
366
|
+
dispatch({
|
|
367
|
+
type: 'RESET_DRAG_CONTAINER',
|
|
368
|
+
payload: {
|
|
369
|
+
itemId: dragStateRef.current.draggedItemId,
|
|
370
|
+
originalContainer: dragStateRef.current.originalContainer,
|
|
371
|
+
originalIndex: dragStateRef.current.originalIndex,
|
|
372
|
+
},
|
|
373
|
+
});
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
// Clear drag state
|
|
377
|
+
dragStateRef.current = {
|
|
378
|
+
isDragging: false,
|
|
379
|
+
draggedItemId: '',
|
|
380
|
+
originalContainer: '',
|
|
381
|
+
originalIndex: -1,
|
|
382
|
+
currentContainer: '',
|
|
383
|
+
dropOccurred: false,
|
|
384
|
+
};
|
|
385
|
+
}
|
|
386
|
+
|
|
387
|
+
prevIsDraggingRef.current = isNowDragging;
|
|
388
|
+
}, [state.isDragging, enableCrossContainerPreview]);
|
|
389
|
+
|
|
151
390
|
const handleDragStart = (id: string, container: string) => {
|
|
391
|
+
// Track drag in ref for global listener
|
|
392
|
+
if (enableCrossContainerPreview) {
|
|
393
|
+
// Find the original index of the item
|
|
394
|
+
const originalIndex = state.items.findIndex(item => item && item.id === id);
|
|
395
|
+
|
|
396
|
+
dragStateRef.current = {
|
|
397
|
+
isDragging: true,
|
|
398
|
+
draggedItemId: id,
|
|
399
|
+
originalContainer: container,
|
|
400
|
+
originalIndex: originalIndex,
|
|
401
|
+
currentContainer: container,
|
|
402
|
+
dropOccurred: false,
|
|
403
|
+
};
|
|
404
|
+
}
|
|
405
|
+
|
|
152
406
|
dispatch({ type: 'SET_DRAG_DATA', payload: { id: id, initialGroup: container, originId: providerId } });
|
|
153
407
|
dispatch({ type: 'SET_IS_DRAGGING', payload: id });
|
|
154
408
|
if (onDragStart) onDragStart(id, container);
|
|
@@ -181,6 +435,10 @@ export const DraggableProvider = ({
|
|
|
181
435
|
newContainer: container,
|
|
182
436
|
},
|
|
183
437
|
});
|
|
438
|
+
// Update current container in ref
|
|
439
|
+
if (enableCrossContainerPreview) {
|
|
440
|
+
dragStateRef.current.currentContainer = container;
|
|
441
|
+
}
|
|
184
442
|
} else {
|
|
185
443
|
// Same container: keep original behavior
|
|
186
444
|
dispatch({
|
|
@@ -193,7 +451,10 @@ export const DraggableProvider = ({
|
|
|
193
451
|
dispatch({type: "REORDER_ITEMS", payload: { dragId: state.dragData.id, targetId: id }});
|
|
194
452
|
}
|
|
195
453
|
|
|
196
|
-
|
|
454
|
+
// When enableCrossContainerPreview is true, preserve the original initialGroup
|
|
455
|
+
// Otherwise, update it to track the current container
|
|
456
|
+
const newInitialGroup = enableCrossContainerPreview ? state.dragData.initialGroup : container;
|
|
457
|
+
dispatch({type: "SET_DRAG_DATA",payload: {id: state.dragData.id, initialGroup: newInitialGroup, originId: providerId}});
|
|
197
458
|
}
|
|
198
459
|
if (onDragEnter) onDragEnter(id, container);
|
|
199
460
|
};
|
|
@@ -202,17 +463,29 @@ export const DraggableProvider = ({
|
|
|
202
463
|
const draggedItemId = state.dragData.id;
|
|
203
464
|
const originalContainer = state.dragData.initialGroup;
|
|
204
465
|
|
|
466
|
+
// If enableCrossContainerPreview is true and no drop occurred, reset item to original container
|
|
467
|
+
if (enableCrossContainerPreview && !dragStateRef.current.dropOccurred && draggedItemId && originalContainer) {
|
|
468
|
+
dispatch({ type: 'RESET_DRAG_CONTAINER', payload: { itemId: draggedItemId, originalContainer, originalIndex: dragStateRef.current.originalIndex } });
|
|
469
|
+
}
|
|
470
|
+
|
|
205
471
|
dispatch({ type: 'SET_IS_DRAGGING', payload: "" });
|
|
206
472
|
dispatch({ type: 'SET_ACTIVE_CONTAINER', payload: "" });
|
|
207
473
|
dispatch({ type: 'SET_DRAG_DATA', payload: { id: "", initialGroup: "", originId: "" } });
|
|
474
|
+
|
|
475
|
+
// Only call onDragEnd if drop didn't already occur (for enableCrossContainerPreview)
|
|
476
|
+
// If drop occurred, handleDrop or global drop handler already called onDragEnd
|
|
477
|
+
if (enableCrossContainerPreview && dragStateRef.current.dropOccurred) {
|
|
478
|
+
return;
|
|
479
|
+
}
|
|
480
|
+
|
|
208
481
|
if (onDragEnd) {
|
|
209
482
|
if (!enableCrossContainerPreview) {
|
|
210
483
|
onDragEnd();
|
|
211
484
|
} else {
|
|
212
|
-
const draggedItem =
|
|
485
|
+
const draggedItem = stateRef.current.items.find(item => item && item.id === draggedItemId);
|
|
213
486
|
const finalContainer = draggedItem ? draggedItem.container : originalContainer;
|
|
214
487
|
|
|
215
|
-
const itemsInContainer =
|
|
488
|
+
const itemsInContainer = stateRef.current.items.filter(item => item && item.container === finalContainer);
|
|
216
489
|
const indexInContainer = itemsInContainer.findIndex(item => item && item.id === draggedItemId);
|
|
217
490
|
const itemAbove = indexInContainer > 0 ? itemsInContainer[indexInContainer - 1] : null;
|
|
218
491
|
const itemBelow = indexInContainer < itemsInContainer.length - 1 ? itemsInContainer[indexInContainer + 1] : null;
|
|
@@ -237,32 +510,58 @@ export const DraggableProvider = ({
|
|
|
237
510
|
|
|
238
511
|
const draggedItemId = state.dragData.id;
|
|
239
512
|
const originalContainer = state.dragData.initialGroup;
|
|
513
|
+
|
|
514
|
+
// Mark drop as successful in ref for global listener
|
|
515
|
+
if (enableCrossContainerPreview) {
|
|
516
|
+
dragStateRef.current.dropOccurred = true;
|
|
517
|
+
}
|
|
518
|
+
|
|
519
|
+
// Gather data for callbacks BEFORE clearing state
|
|
520
|
+
const isCrossContainer = container !== originalContainer;
|
|
521
|
+
let callbackData = null;
|
|
522
|
+
|
|
523
|
+
if (enableCrossContainerPreview) {
|
|
524
|
+
const draggedItem = stateRef.current.items.find(item => item && item.id === draggedItemId);
|
|
525
|
+
const updatedItem = draggedItem ? { ...draggedItem, container } : null;
|
|
526
|
+
const itemsInContainer = stateRef.current.items.filter(item => item && item.container === container);
|
|
527
|
+
const indexInContainer = itemsInContainer.findIndex(item => item && item.id === draggedItemId);
|
|
528
|
+
const itemAbove = indexInContainer > 0 ? itemsInContainer[indexInContainer - 1] : null;
|
|
529
|
+
const itemBelow = indexInContainer < itemsInContainer.length - 1 ? itemsInContainer[indexInContainer + 1] : null;
|
|
530
|
+
|
|
531
|
+
callbackData = { updatedItem, itemAbove, itemBelow };
|
|
532
|
+
}
|
|
240
533
|
|
|
241
534
|
dispatch({ type: 'SET_IS_DRAGGING', payload: "" });
|
|
242
535
|
dispatch({ type: 'SET_ACTIVE_CONTAINER', payload: "" });
|
|
536
|
+
dispatch({ type: 'SET_DRAG_DATA', payload: { id: "", initialGroup: "", originId: "" } });
|
|
243
537
|
changeCategory(state.dragData.id, container);
|
|
538
|
+
|
|
244
539
|
if (onDrop) {
|
|
245
540
|
if (!enableCrossContainerPreview) {
|
|
246
541
|
onDrop(container);
|
|
247
542
|
} else {
|
|
248
|
-
const draggedItem = state.items.find(item => item && item.id === draggedItemId);
|
|
249
|
-
const updatedItem = draggedItem ? { ...draggedItem, container } : null;
|
|
250
|
-
|
|
251
|
-
const itemsInContainer = state.items.filter(item => item && item.container === container);
|
|
252
|
-
const indexInContainer = itemsInContainer.findIndex(item => item && item.id === draggedItemId);
|
|
253
|
-
const itemAbove = indexInContainer > 0 ? itemsInContainer[indexInContainer - 1] : null;
|
|
254
|
-
const itemBelow = indexInContainer < itemsInContainer.length - 1 ? itemsInContainer[indexInContainer + 1] : null;
|
|
255
|
-
|
|
256
543
|
onDrop(
|
|
257
544
|
draggedItemId,
|
|
258
545
|
container,
|
|
259
546
|
originalContainer,
|
|
260
|
-
updatedItem,
|
|
261
|
-
itemAbove,
|
|
262
|
-
itemBelow
|
|
547
|
+
callbackData.updatedItem,
|
|
548
|
+
callbackData.itemAbove,
|
|
549
|
+
callbackData.itemBelow
|
|
263
550
|
);
|
|
264
551
|
}
|
|
265
552
|
}
|
|
553
|
+
|
|
554
|
+
// Trigger onDragEnd ONLY for cross-container drops (dragend doesn't fire reliably in that case)
|
|
555
|
+
// For same-container drops, handleDragEnd will be called normally
|
|
556
|
+
if (enableCrossContainerPreview && isCrossContainer && onDragEnd && callbackData) {
|
|
557
|
+
onDragEnd(
|
|
558
|
+
draggedItemId,
|
|
559
|
+
container,
|
|
560
|
+
originalContainer,
|
|
561
|
+
callbackData.itemAbove,
|
|
562
|
+
callbackData.itemBelow
|
|
563
|
+
);
|
|
564
|
+
}
|
|
266
565
|
};
|
|
267
566
|
|
|
268
567
|
const handleDragOver = (e: Event, container: string) => {
|
|
@@ -281,6 +580,8 @@ export const DraggableProvider = ({
|
|
|
281
580
|
type: "MOVE_TO_CONTAINER_END",
|
|
282
581
|
payload: { dragId: state.dragData.id, newContainer: container },
|
|
283
582
|
});
|
|
583
|
+
// Update current container in ref
|
|
584
|
+
dragStateRef.current.currentContainer = container;
|
|
284
585
|
}
|
|
285
586
|
}
|
|
286
587
|
|
|
@@ -23,7 +23,7 @@ export type ActionType =
|
|
|
23
23
|
| { type: 'REORDER_ITEMS'; payload: { dragId: string; targetId: string } }
|
|
24
24
|
| { type: 'REORDER_ITEMS_CROSS_CONTAINER'; payload: { dragId: string; targetId: string; newContainer: string } }
|
|
25
25
|
| { type: 'MOVE_TO_CONTAINER_END'; payload: { dragId: string; newContainer: string } }
|
|
26
|
-
| { type: 'RESET_DRAG_CONTAINER'; payload: { itemId: string; originalContainer: string } };
|
|
26
|
+
| { type: 'RESET_DRAG_CONTAINER'; payload: { itemId: string; originalContainer: string, originalIndex: number } };
|
|
27
27
|
|
|
28
28
|
export interface DropZoneConfig {
|
|
29
29
|
type?: 'ghost' | 'outline' | 'shadow' | 'line';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Error shows that the radio option must be selected or is invalid (
|
|
1
|
+
Error shows that the radio option must be selected or is invalid (i.e. when used in a form it signals a user to fix an error).
|
|
@@ -29,6 +29,7 @@ type SelectProps = {
|
|
|
29
29
|
id?: string,
|
|
30
30
|
includeBlank?: string,
|
|
31
31
|
inline?: boolean,
|
|
32
|
+
inputOptions?: {[key: string]: string | number | boolean | (() => void)},
|
|
32
33
|
label?: string,
|
|
33
34
|
margin: string,
|
|
34
35
|
marginBottom: string,
|
|
@@ -63,6 +64,7 @@ const Select = ({
|
|
|
63
64
|
label,
|
|
64
65
|
htmlOptions = {},
|
|
65
66
|
inline = false,
|
|
67
|
+
inputOptions = {},
|
|
66
68
|
multiple = false,
|
|
67
69
|
name,
|
|
68
70
|
onChange = () => undefined,
|
|
@@ -94,14 +96,17 @@ const Select = ({
|
|
|
94
96
|
const angleDown = getAllIcons()["angleDown"].icon as unknown as { [key: string]: SVGElement }
|
|
95
97
|
|
|
96
98
|
const selectWrapperClass = classnames(buildCss('pb_select_kit_wrapper'), { error }, className)
|
|
99
|
+
const selectId = (inputOptions?.id as string) || name
|
|
100
|
+
|
|
97
101
|
const selectBody =(() =>{
|
|
98
102
|
if (children) return children
|
|
99
103
|
return (
|
|
100
104
|
<select
|
|
101
105
|
{...htmlOptions}
|
|
102
106
|
{...domSafeProps(props)}
|
|
107
|
+
{...inputOptions}
|
|
103
108
|
disabled={disabled}
|
|
104
|
-
id={
|
|
109
|
+
id={selectId}
|
|
105
110
|
multiple={multiple}
|
|
106
111
|
name={name}
|
|
107
112
|
onChange={onChange}
|
|
@@ -125,7 +130,7 @@ const Select = ({
|
|
|
125
130
|
{label &&
|
|
126
131
|
<label
|
|
127
132
|
className="pb_select_kit_label"
|
|
128
|
-
htmlFor={
|
|
133
|
+
htmlFor={selectId}
|
|
129
134
|
>
|
|
130
135
|
<Caption
|
|
131
136
|
dark={props.dark}
|
|
@@ -135,7 +140,7 @@ const Select = ({
|
|
|
135
140
|
}
|
|
136
141
|
<label
|
|
137
142
|
className={selectWrapperClass}
|
|
138
|
-
htmlFor={
|
|
143
|
+
htmlFor={selectId}
|
|
139
144
|
>
|
|
140
145
|
{selectBody}
|
|
141
146
|
{ multiple !== true ?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Select w/ Error shows that
|
|
1
|
+
Select w/ Error shows that an option must be selected or is invalid (i.e. when used in a form it signals a user to fix an error).
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
<%= pb_rails("select", props: {
|
|
2
|
+
label: "Favorite Food",
|
|
3
|
+
name: "favorite_food",
|
|
4
|
+
options: [
|
|
5
|
+
{ value: "pizza", value_text: "Pizza" },
|
|
6
|
+
{ value: "tacos", value_text: "Tacos" },
|
|
7
|
+
{ value: "sushi", value_text: "Sushi" }
|
|
8
|
+
],
|
|
9
|
+
input_options: {
|
|
10
|
+
'aria-label': "Select your favorite food",
|
|
11
|
+
class: "custom-select-class",
|
|
12
|
+
data: { controller: "search", action: "change->search#filter" },
|
|
13
|
+
id: "favorite-food-select"
|
|
14
|
+
}
|
|
15
|
+
}) %>
|
|
16
|
+
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import React from 'react'
|
|
2
|
+
|
|
3
|
+
import Select from '../_select'
|
|
4
|
+
|
|
5
|
+
const SelectInputOptions = (props) => {
|
|
6
|
+
const options = [
|
|
7
|
+
{ value: 'pizza', text: 'Pizza' },
|
|
8
|
+
{ value: 'tacos', text: 'Tacos' },
|
|
9
|
+
{ value: 'sushi', text: 'Sushi' },
|
|
10
|
+
]
|
|
11
|
+
|
|
12
|
+
return (
|
|
13
|
+
<>
|
|
14
|
+
<Select
|
|
15
|
+
inputOptions={{
|
|
16
|
+
'aria-label': 'Select your favorite food',
|
|
17
|
+
className: 'custom-select-class',
|
|
18
|
+
id: 'favorite-food-select',
|
|
19
|
+
}}
|
|
20
|
+
label="Favorite Food"
|
|
21
|
+
name="favorite_food"
|
|
22
|
+
options={options}
|
|
23
|
+
{...props}
|
|
24
|
+
/>
|
|
25
|
+
</>
|
|
26
|
+
)
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export default SelectInputOptions
|
|
30
|
+
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
Use the `input_options` / `inputOptions` prop to pass additional attributes directly to the underlying `<select>` element instead of the outer wrapper. This is useful for applying data attributes, custom IDs, or other HTML attributes that need to be on the select element itself.
|
|
@@ -15,6 +15,7 @@ examples:
|
|
|
15
15
|
- select_inline_compact: Select Inline Compact
|
|
16
16
|
- select_attributes: Select W/ Attributes
|
|
17
17
|
- select_multiple: Select Multiple
|
|
18
|
+
- select_input_options: Input Options
|
|
18
19
|
|
|
19
20
|
|
|
20
21
|
|
|
@@ -33,6 +34,7 @@ examples:
|
|
|
33
34
|
- select_inline_compact: Select Inline Compact
|
|
34
35
|
- select_multiple: Select Multiple
|
|
35
36
|
- select_react_hook: React Hook
|
|
37
|
+
- select_input_options: Input Options
|
|
36
38
|
|
|
37
39
|
swift:
|
|
38
40
|
- select_default_swift: Default
|
|
@@ -12,3 +12,4 @@ export { default as SelectInlineCompact } from './_select_inline_compact.jsx'
|
|
|
12
12
|
export { default as SelectMultiple } from './_select_multiple.jsx'
|
|
13
13
|
export { default as SelectReactHook } from './_select_react_hook.jsx'
|
|
14
14
|
export { default as SelectCustomSelectSubheaders } from './_select_custom_select_subheaders.jsx'
|
|
15
|
+
export { default as SelectInputOptions } from './_select_input_options.jsx'
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
id: nil,
|
|
3
3
|
class: object.classnames ) do %>
|
|
4
4
|
<% if object.label %>
|
|
5
|
-
<label class="pb_select_kit_label" for="<%= object.name %>">
|
|
5
|
+
<label class="pb_select_kit_label" for="<%= object.input_options[:id] || object.name %>">
|
|
6
6
|
<%= pb_rails("caption", props: { text: object.label, dark: object.dark }) %>
|
|
7
7
|
</label>
|
|
8
8
|
<% end %>
|
|
9
|
-
<label class="<%= object.select_wrapper_class %>" for="<%= object.name %>">
|
|
9
|
+
<label class="<%= object.select_wrapper_class %>" for="<%= object.input_options[:id] || object.name %>">
|
|
10
10
|
<% if content.present? %>
|
|
11
11
|
<%= content %>
|
|
12
12
|
<%= pb_rails("body", props: { status: "negative", text: object.error }) %>
|
|
@@ -14,6 +14,8 @@ module Playbook
|
|
|
14
14
|
prop :error
|
|
15
15
|
prop :include_blank
|
|
16
16
|
prop :inline, type: Playbook::Props::Boolean, default: false
|
|
17
|
+
prop :input_options, type: Playbook::Props::HashProp,
|
|
18
|
+
default: {}
|
|
17
19
|
prop :label
|
|
18
20
|
prop :multiple, type: Playbook::Props::Boolean, default: false
|
|
19
21
|
prop :name
|
|
@@ -38,7 +40,7 @@ module Playbook
|
|
|
38
40
|
multiple: multiple,
|
|
39
41
|
onchange: onchange,
|
|
40
42
|
include_blank: include_blank,
|
|
41
|
-
}.merge(attributes)
|
|
43
|
+
}.merge(attributes).merge(input_options)
|
|
42
44
|
end
|
|
43
45
|
|
|
44
46
|
def classname
|
|
@@ -65,4 +65,27 @@ test('returns multiple variant', () => {
|
|
|
65
65
|
const selectElement = kit.querySelector('select');
|
|
66
66
|
|
|
67
67
|
expect(selectElement).toHaveAttribute('multiple', '');
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
test('inputOptions are passed to select element', () => {
|
|
71
|
+
render(
|
|
72
|
+
<Select
|
|
73
|
+
data={{ testid: testId }}
|
|
74
|
+
inputOptions={{
|
|
75
|
+
id: 'custom-select-id',
|
|
76
|
+
className: 'custom-select-class',
|
|
77
|
+
'aria-label': 'Custom aria label',
|
|
78
|
+
}}
|
|
79
|
+
label="Favorite Food"
|
|
80
|
+
name="food"
|
|
81
|
+
options={options}
|
|
82
|
+
/>
|
|
83
|
+
)
|
|
84
|
+
|
|
85
|
+
const kit = screen.getByTestId(testId)
|
|
86
|
+
const selectElement = kit.querySelector('select')
|
|
87
|
+
|
|
88
|
+
expect(selectElement).toHaveAttribute('id', 'custom-select-id')
|
|
89
|
+
expect(selectElement).toHaveClass('custom-select-class')
|
|
90
|
+
expect(selectElement).toHaveAttribute('aria-label', 'Custom aria label')
|
|
68
91
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Text Input w/ Error shows that the
|
|
1
|
+
Text Input w/ Error shows that the input must be filled out (i.e. when used in a form it signals a user to fix an error).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Textarea w/ Error shows that the
|
|
1
|
+
Textarea w/ Error shows that the input must be filled out (i.e. when used in a form it signals a user to fix an error).
|
|
@@ -139,7 +139,8 @@ $text_colors: (
|
|
|
139
139
|
text_lt_lighter: $text_lt_lighter,
|
|
140
140
|
text_dk_default: $text_dk_default,
|
|
141
141
|
text_dk_light: $text_dk_light,
|
|
142
|
-
text_dk_lighter: $text_dk_lighter
|
|
142
|
+
text_dk_lighter: $text_dk_lighter,
|
|
143
|
+
text_dk_success_sm: $text_dk_success_sm
|
|
143
144
|
);
|
|
144
145
|
|
|
145
146
|
/* Data colors ------------------------*/
|