playbook_ui 15.3.0.pre.alpha.PLAY2601advancedtablecustomcellmultiheaderrails12030 → 15.3.0.pre.alpha.PLAY2624stickyColumnnullerror12217
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_advanced_table/Components/RegularTableView.tsx +2 -1
- data/app/pb_kits/playbook/pb_advanced_table/Utilities/RowUtils.ts +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/_advanced_table.scss +4 -4
- data/app/pb_kits/playbook/pb_advanced_table/advanced_table.test.jsx +68 -5
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_background_control_rails.html.erb +4 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_background_control_rails.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling.jsx +3 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling.md +2 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_column_headers.jsx +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_rails.html.erb +1 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_column_styling_rails.md +2 -0
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_padding_control.jsx +9 -1
- data/app/pb_kits/playbook/pb_advanced_table/docs/_advanced_table_padding_control.md +1 -1
- data/app/pb_kits/playbook/pb_advanced_table/flat_advanced_table.js +2 -2
- data/app/pb_kits/playbook/pb_advanced_table/index.js +7 -7
- data/app/pb_kits/playbook/pb_advanced_table/scss_partials/advanced_table_sticky_mixin.scss +2 -2
- data/app/pb_kits/playbook/pb_advanced_table/table_row.rb +32 -3
- data/app/pb_kits/playbook/pb_background/background.html.erb +10 -2
- data/app/pb_kits/playbook/pb_badge/_badge.tsx +4 -1
- data/app/pb_kits/playbook/pb_badge/badge.test.js +13 -0
- data/app/pb_kits/playbook/pb_currency/_currency.tsx +20 -7
- data/app/pb_kits/playbook/pb_currency/currency.rb +35 -8
- data/app/pb_kits/playbook/pb_currency/currency.test.js +47 -0
- data/app/pb_kits/playbook/pb_currency/docs/_currency_variants.html.erb +1 -1
- data/app/pb_kits/playbook/pb_currency/docs/_currency_variants.jsx +1 -1
- data/app/pb_kits/playbook/pb_currency/docs/_currency_variants.md +1 -0
- data/app/pb_kits/playbook/pb_date_picker/date_picker_helper.ts +16 -4
- data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_and_dropdown_range.jsx +38 -0
- data/app/pb_kits/playbook/pb_date_picker/docs/_date_picker_and_dropdown_range.md +14 -0
- data/app/pb_kits/playbook/pb_date_picker/docs/example.yml +2 -1
- data/app/pb_kits/playbook/pb_date_picker/docs/index.js +2 -1
- data/app/pb_kits/playbook/pb_dropdown/_dropdown.scss +1 -0
- data/app/pb_kits/playbook/pb_dropdown/_dropdown.tsx +111 -6
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick.jsx +18 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick.md +4 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_default_dates.jsx +18 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_default_dates.md +1 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_range_end.jsx +19 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_range_end.md +1 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_with_date_pickers.jsx +38 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/_dropdown_quickpick_with_date_pickers.md +14 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/example.yml +5 -0
- data/app/pb_kits/playbook/pb_dropdown/docs/index.js +5 -1
- data/app/pb_kits/playbook/pb_dropdown/dropdown.test.jsx +148 -2
- data/app/pb_kits/playbook/pb_dropdown/quickpick/index.ts +60 -0
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_auto_close.html.erb +15 -1
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_multi_line.html.erb +9 -8
- data/app/pb_kits/playbook/pb_fixed_confirmation_toast/docs/_fixed_confirmation_toast_positions.html.erb +11 -10
- data/app/pb_kits/playbook/pb_form/pb_form_validation.js +44 -11
- data/app/pb_kits/playbook/pb_form_pill/_form_pill.tsx +1 -1
- data/app/pb_kits/playbook/pb_phone_number_input/_phone_number_input.tsx +110 -17
- data/app/pb_kits/playbook/pb_table/_table.tsx +28 -26
- data/app/pb_kits/playbook/pb_typeahead/_typeahead.scss +7 -0
- data/app/pb_kits/playbook/pb_typeahead/_typeahead.test.jsx +64 -1
- data/app/pb_kits/playbook/pb_typeahead/components/MultiValue.tsx +33 -1
- data/dist/chunks/{_line_graph-CqE0-dq5.js → _line_graph-C-AuMGN2.js} +1 -1
- data/dist/chunks/_typeahead--38pnHwS.js +6 -0
- data/dist/chunks/_weekday_stacked-Db5x2Q33.js +37 -0
- data/dist/chunks/{lib-CGxXTQ75.js → lib-BXBHAZMY.js} +1 -1
- data/dist/chunks/pb_form_validation-BNfSnIUF.js +1 -0
- data/dist/chunks/vendor.js +1 -1
- data/dist/playbook-doc.js +1 -1
- 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/version.rb +1 -1
- metadata +19 -7
- data/dist/chunks/_typeahead-3ZAbZUqU.js +0 -6
- data/dist/chunks/_weekday_stacked-BFB3mjtE.js +0 -37
- data/dist/chunks/pb_form_validation-DebqlUKZ.js +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from "react"
|
|
1
|
+
import React, { useState } from "react"
|
|
2
2
|
import { render, screen, fireEvent } from "../utilities/test-utils"
|
|
3
3
|
|
|
4
4
|
import { Dropdown, Icon, IconCircle } from 'playbook-ui'
|
|
@@ -393,4 +393,150 @@ test("applies activeStyle backgroundColor and fontColor when selected", () => {
|
|
|
393
393
|
expect(selected).toBeInTheDocument()
|
|
394
394
|
expect(selected).toHaveClass("bg-bg_light")
|
|
395
395
|
expect(selected).toHaveClass("font-primary")
|
|
396
|
-
})
|
|
396
|
+
})
|
|
397
|
+
|
|
398
|
+
test("renders quickpick variant with auto-generated options", () => {
|
|
399
|
+
render(
|
|
400
|
+
<Dropdown
|
|
401
|
+
data={{ testid: testId }}
|
|
402
|
+
variant="quickpick"
|
|
403
|
+
/>
|
|
404
|
+
)
|
|
405
|
+
|
|
406
|
+
const kit = screen.getByTestId(testId)
|
|
407
|
+
expect(kit).toHaveClass('pb_dropdown_quickpick')
|
|
408
|
+
|
|
409
|
+
// Check that quickpick options are generated
|
|
410
|
+
const options = kit.querySelectorAll('.pb_dropdown_option_list')
|
|
411
|
+
expect(options.length).toBe(10)
|
|
412
|
+
expect(options[0]).toHaveTextContent("Today")
|
|
413
|
+
})
|
|
414
|
+
|
|
415
|
+
test("quickpick variant accepts string defaultValue", () => {
|
|
416
|
+
render(
|
|
417
|
+
<Dropdown
|
|
418
|
+
data={{ testid: testId }}
|
|
419
|
+
defaultValue="This Month"
|
|
420
|
+
variant="quickpick"
|
|
421
|
+
/>
|
|
422
|
+
)
|
|
423
|
+
|
|
424
|
+
const kit = screen.getByTestId(testId)
|
|
425
|
+
const trigger = kit.querySelector('.pb_dropdown_trigger')
|
|
426
|
+
|
|
427
|
+
expect(trigger).toHaveTextContent("This Month")
|
|
428
|
+
})
|
|
429
|
+
|
|
430
|
+
test("quickpick attaches _dropdownRef to DOM element when id is provided", () => {
|
|
431
|
+
render(
|
|
432
|
+
<Dropdown
|
|
433
|
+
data={{ testid: testId }}
|
|
434
|
+
id="test-quickpick"
|
|
435
|
+
variant="quickpick"
|
|
436
|
+
/>
|
|
437
|
+
)
|
|
438
|
+
|
|
439
|
+
const kit = screen.getByTestId(testId)
|
|
440
|
+
|
|
441
|
+
// Check that the element has the _dropdownRef attached
|
|
442
|
+
expect(kit._dropdownRef).toBeDefined()
|
|
443
|
+
expect(kit._dropdownRef.current).toBeDefined()
|
|
444
|
+
expect(kit._dropdownRef.current.clearSelected).toBeDefined()
|
|
445
|
+
})
|
|
446
|
+
|
|
447
|
+
test("quickpick clears selection when clicking X icon", () => {
|
|
448
|
+
render(
|
|
449
|
+
<Dropdown
|
|
450
|
+
data={{ testid: testId }}
|
|
451
|
+
defaultValue="This Week"
|
|
452
|
+
variant="quickpick"
|
|
453
|
+
/>
|
|
454
|
+
)
|
|
455
|
+
|
|
456
|
+
const kit = screen.getByTestId(testId)
|
|
457
|
+
const trigger = kit.querySelector('.pb_dropdown_trigger')
|
|
458
|
+
|
|
459
|
+
expect(trigger).toHaveTextContent("This Week")
|
|
460
|
+
|
|
461
|
+
const clearIcon = kit.querySelector('[aria-label="times icon"]')
|
|
462
|
+
expect(clearIcon).toBeInTheDocument()
|
|
463
|
+
|
|
464
|
+
fireEvent.click(clearIcon.parentElement)
|
|
465
|
+
|
|
466
|
+
expect(trigger).toHaveTextContent("Select...")
|
|
467
|
+
})
|
|
468
|
+
|
|
469
|
+
test("quickpick returns date array values when option selected", () => {
|
|
470
|
+
const TestComponent = () => {
|
|
471
|
+
const [selected, setSelected] = useState(null)
|
|
472
|
+
return (
|
|
473
|
+
<>
|
|
474
|
+
<Dropdown
|
|
475
|
+
data={{ testid: testId }}
|
|
476
|
+
onSelect={(item) => setSelected(item)}
|
|
477
|
+
variant="quickpick"
|
|
478
|
+
/>
|
|
479
|
+
{selected && (
|
|
480
|
+
<div data-testid="selected-value">
|
|
481
|
+
{JSON.stringify({
|
|
482
|
+
label: selected.label,
|
|
483
|
+
hasValue: !!selected.value,
|
|
484
|
+
isArray: Array.isArray(selected.value),
|
|
485
|
+
valueLength: selected.value?.length
|
|
486
|
+
})}
|
|
487
|
+
</div>
|
|
488
|
+
)}
|
|
489
|
+
</>
|
|
490
|
+
)
|
|
491
|
+
}
|
|
492
|
+
|
|
493
|
+
render(<TestComponent />)
|
|
494
|
+
|
|
495
|
+
const kit = screen.getByTestId(testId)
|
|
496
|
+
const options = kit.querySelectorAll('.pb_dropdown_option_list')
|
|
497
|
+
|
|
498
|
+
fireEvent.click(options[0])
|
|
499
|
+
|
|
500
|
+
const selectedValue = screen.getByTestId('selected-value')
|
|
501
|
+
const data = JSON.parse(selectedValue.textContent)
|
|
502
|
+
|
|
503
|
+
expect(data.label).toBe("Today")
|
|
504
|
+
expect(data.hasValue).toBe(true)
|
|
505
|
+
expect(data.isArray).toBe(true)
|
|
506
|
+
expect(data.valueLength).toBe(2)
|
|
507
|
+
})
|
|
508
|
+
|
|
509
|
+
test("quickpick option values are Date objects", () => {
|
|
510
|
+
const onSelectMock = jest.fn()
|
|
511
|
+
|
|
512
|
+
render(
|
|
513
|
+
<Dropdown
|
|
514
|
+
data={{ testid: testId }}
|
|
515
|
+
onSelect={onSelectMock}
|
|
516
|
+
variant="quickpick"
|
|
517
|
+
/>
|
|
518
|
+
)
|
|
519
|
+
|
|
520
|
+
const kit = screen.getByTestId(testId)
|
|
521
|
+
const options = kit.querySelectorAll('.pb_dropdown_option_list')
|
|
522
|
+
|
|
523
|
+
const thisMonthOption = Array.from(options).find(opt => opt.textContent === 'This Month')
|
|
524
|
+
fireEvent.click(thisMonthOption)
|
|
525
|
+
|
|
526
|
+
const selectedItem = onSelectMock.mock.calls[0][0]
|
|
527
|
+
|
|
528
|
+
expect(selectedItem.label).toBe("This Month")
|
|
529
|
+
expect(selectedItem.value).toBeDefined()
|
|
530
|
+
expect(Array.isArray(selectedItem.value)).toBe(true)
|
|
531
|
+
expect(selectedItem.value.length).toBe(2)
|
|
532
|
+
|
|
533
|
+
const [startDate, endDate] = selectedItem.value
|
|
534
|
+
|
|
535
|
+
expect(startDate instanceof Date).toBe(true)
|
|
536
|
+
expect(endDate instanceof Date).toBe(true)
|
|
537
|
+
|
|
538
|
+
expect(startDate.getTime()).not.toBeNaN()
|
|
539
|
+
expect(endDate.getTime()).not.toBeNaN()
|
|
540
|
+
|
|
541
|
+
expect(endDate.getTime()).toBeGreaterThanOrEqual(startDate.getTime())
|
|
542
|
+
})
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// QuickPick default options for Dropdown
|
|
2
|
+
// This provides date range options similar to the DatePicker QuickPick functionality
|
|
3
|
+
|
|
4
|
+
import DateTime from '../../pb_kit/dateTime';
|
|
5
|
+
|
|
6
|
+
type QuickPickOption = {
|
|
7
|
+
label: string;
|
|
8
|
+
value: Date[];
|
|
9
|
+
formattedStartDate?: string;
|
|
10
|
+
formattedEndDate?: string;
|
|
11
|
+
id?: string;
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
// Helper to get QuickPick options with date ranges
|
|
15
|
+
const getQuickPickOptions = (rangeEndsToday = false): QuickPickOption[] => {
|
|
16
|
+
const today = new Date();
|
|
17
|
+
const yesterday = DateTime.getYesterdayDate(new Date());
|
|
18
|
+
|
|
19
|
+
const thisWeekStartDate = DateTime.getFirstDayOfWeek(new Date());
|
|
20
|
+
const thisWeekEndDate = rangeEndsToday ? new Date() : DateTime.getLastDayOfWeek(new Date());
|
|
21
|
+
const lastWeekStartDate = DateTime.getPreviousWeekStartDate(new Date());
|
|
22
|
+
const lastWeekEndDate = DateTime.getPreviousWeekEndDate(new Date());
|
|
23
|
+
|
|
24
|
+
const thisMonthStartDate = DateTime.getMonthStartDate(new Date());
|
|
25
|
+
const thisMonthEndDate = rangeEndsToday ? new Date() : DateTime.getMonthEndDate(new Date());
|
|
26
|
+
const lastMonthStartDate = DateTime.getPreviousMonthStartDate(new Date());
|
|
27
|
+
const lastMonthEndDate = DateTime.getPreviousMonthEndDate(new Date());
|
|
28
|
+
|
|
29
|
+
const thisQuarterStartDate = DateTime.getQuarterStartDate(new Date());
|
|
30
|
+
const thisQuarterEndDate = rangeEndsToday ? new Date() : DateTime.getQuarterEndDate(new Date());
|
|
31
|
+
const lastQuarterStartDate = DateTime.getPreviousQuarterStartDate(new Date());
|
|
32
|
+
const lastQuarterEndDate = DateTime.getPreviousQuarterEndDate(new Date());
|
|
33
|
+
|
|
34
|
+
const thisYearStartDate = DateTime.getYearStartDate(new Date());
|
|
35
|
+
const thisYearEndDate = rangeEndsToday ? new Date() : DateTime.getYearEndDate(new Date());
|
|
36
|
+
const lastYearStartDate = DateTime.getPreviousYearStartDate(new Date());
|
|
37
|
+
const lastYearEndDate = DateTime.getPreviousYearEndDate(new Date());
|
|
38
|
+
|
|
39
|
+
const formatDate = (date: Date) => {
|
|
40
|
+
const day = String(date.getDate()).padStart(2, "0")
|
|
41
|
+
const month = String(date.getMonth() + 1).padStart(2, "0")
|
|
42
|
+
const year = date.getFullYear()
|
|
43
|
+
|
|
44
|
+
return `${month}/${day}/${year}`
|
|
45
|
+
}
|
|
46
|
+
return [
|
|
47
|
+
{ label: 'Today', value: [today, today], id: 'quickpick-today' },
|
|
48
|
+
{ label: 'Yesterday', value: [yesterday, yesterday], formattedStartDate: `${formatDate(yesterday)}`, formattedEndDate: `${formatDate(yesterday)}`, id: 'quickpick-yesterday' },
|
|
49
|
+
{ label: 'This Week', value: [thisWeekStartDate, thisWeekEndDate], formattedStartDate: `${formatDate(thisWeekStartDate)}`, formattedEndDate: `${formatDate(thisWeekEndDate)}`, id: 'quickpick-this-week' },
|
|
50
|
+
{ label: 'This Month', value: [thisMonthStartDate, thisMonthEndDate], formattedStartDate: `${formatDate(thisMonthStartDate)}`, formattedEndDate: `${formatDate(thisMonthEndDate)}`, id: 'quickpick-this-month' },
|
|
51
|
+
{ label: 'This Quarter', value: [thisQuarterStartDate, thisQuarterEndDate], formattedStartDate: `${formatDate(thisQuarterStartDate)}`, formattedEndDate: `${formatDate(thisQuarterEndDate)}`, id: 'quickpick-this-quarter' },
|
|
52
|
+
{ label: 'This Year', value: [thisYearStartDate, thisYearEndDate], formattedStartDate: `${formatDate(thisYearStartDate)}`, formattedEndDate: `${formatDate(thisYearEndDate)}`, id: 'quickpick-this-year' },
|
|
53
|
+
{ label: 'Last Week', value: [lastWeekStartDate, lastWeekEndDate], formattedStartDate: `${formatDate(lastWeekStartDate)}`, formattedEndDate: `${formatDate(lastWeekEndDate)}`, id: 'quickpick-last-week' },
|
|
54
|
+
{ label: 'Last Month', value: [lastMonthStartDate, lastMonthEndDate], formattedStartDate: `${formatDate(lastMonthStartDate)}`, formattedEndDate: `${formatDate(lastMonthEndDate)}`, id: 'quickpick-last-month' },
|
|
55
|
+
{ label: 'Last Quarter', value: [lastQuarterStartDate, lastQuarterEndDate], formattedStartDate: `${formatDate(lastQuarterStartDate)}`, formattedEndDate: `${formatDate(lastQuarterEndDate)}`, id: 'quickpick-last-quarter' },
|
|
56
|
+
{ label: 'Last Year', value: [lastYearStartDate, lastYearEndDate], formattedStartDate: `${formatDate(lastYearStartDate)}`, formattedEndDate: `${formatDate(lastYearEndDate)}`, id: 'quickpick-last-year' },
|
|
57
|
+
];
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
export default getQuickPickOptions
|
|
@@ -22,13 +22,27 @@
|
|
|
22
22
|
}) %>
|
|
23
23
|
|
|
24
24
|
<script>
|
|
25
|
+
// Hide toasts immediately
|
|
26
|
+
const hideAutoToasts = () => {
|
|
27
|
+
const toastAuto = document.getElementById('toast-auto-close');
|
|
28
|
+
const toastAutoCloseable = document.getElementById('toast-auto-close-closeable');
|
|
29
|
+
if (toastAuto) toastAuto.style.display = 'none';
|
|
30
|
+
if (toastAutoCloseable) toastAutoCloseable.style.display = 'none';
|
|
31
|
+
}
|
|
32
|
+
hideAutoToasts();
|
|
33
|
+
|
|
34
|
+
// Handle various page load/restore events
|
|
35
|
+
window.addEventListener('pageshow', hideAutoToasts)
|
|
36
|
+
document.addEventListener('turbolinks:load', hideAutoToasts)
|
|
37
|
+
document.addEventListener('turbo:load', hideAutoToasts)
|
|
38
|
+
|
|
25
39
|
document.addEventListener('DOMContentLoaded', () => {
|
|
26
40
|
// Initialize toast elements and buttons
|
|
27
41
|
const toasts = {
|
|
28
42
|
'#toast-auto-close': document.querySelector("#toast-auto-close"),
|
|
29
43
|
'#toast-auto-close-closeable': document.querySelector("#toast-auto-close-closeable")
|
|
30
44
|
}
|
|
31
|
-
|
|
45
|
+
|
|
32
46
|
const buttons = {
|
|
33
47
|
'#toast-auto-close': document.querySelector("button[data-toast='#toast-auto-close']"),
|
|
34
48
|
'#toast-auto-close-closeable': document.querySelector("button[data-toast='#toast-auto-close-closeable']")
|
|
@@ -24,7 +24,6 @@
|
|
|
24
24
|
horizontal: "center"
|
|
25
25
|
}) %>
|
|
26
26
|
|
|
27
|
-
|
|
28
27
|
<script type="text/javascript">
|
|
29
28
|
const multitoasts = document.querySelectorAll(".multitoast-to-hide")
|
|
30
29
|
const multibuttons = document.querySelectorAll("button[data-multitoast]")
|
|
@@ -35,6 +34,15 @@
|
|
|
35
34
|
})
|
|
36
35
|
}
|
|
37
36
|
|
|
37
|
+
// Hide toasts immediately
|
|
38
|
+
hideMultiToasts()
|
|
39
|
+
|
|
40
|
+
// Handle various page load/restore events
|
|
41
|
+
window.addEventListener('pageshow', hideMultiToasts)
|
|
42
|
+
document.addEventListener('DOMContentLoaded', hideMultiToasts)
|
|
43
|
+
document.addEventListener('turbolinks:load', hideMultiToasts)
|
|
44
|
+
document.addEventListener('turbo:load', hideMultiToasts)
|
|
45
|
+
|
|
38
46
|
multibuttons.forEach((button) => {
|
|
39
47
|
button.onclick = () => {
|
|
40
48
|
hideMultiToasts()
|
|
@@ -46,10 +54,3 @@
|
|
|
46
54
|
}
|
|
47
55
|
})
|
|
48
56
|
</script>
|
|
49
|
-
|
|
50
|
-
<!-- hiding toast on page load -->
|
|
51
|
-
<style>
|
|
52
|
-
#toast-long, #toast-short {
|
|
53
|
-
display: none;
|
|
54
|
-
}
|
|
55
|
-
</style>
|
|
@@ -69,27 +69,28 @@
|
|
|
69
69
|
const toasts = document.querySelectorAll(".toast-to-hide")
|
|
70
70
|
const buttons = document.querySelectorAll("button[data-toast]")
|
|
71
71
|
|
|
72
|
-
const
|
|
72
|
+
const hidePositionToasts = () => {
|
|
73
73
|
toasts.forEach((toast) => {
|
|
74
74
|
toast.style.display = "none"
|
|
75
75
|
})
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
+
// Hide toasts immediately
|
|
79
|
+
hidePositionToasts()
|
|
80
|
+
|
|
81
|
+
// Handle various page load/restore events
|
|
82
|
+
window.addEventListener('pageshow', hidePositionToasts)
|
|
83
|
+
document.addEventListener('DOMContentLoaded', hidePositionToasts)
|
|
84
|
+
document.addEventListener('turbolinks:load', hidePositionToasts)
|
|
85
|
+
document.addEventListener('turbo:load', hidePositionToasts)
|
|
86
|
+
|
|
78
87
|
buttons.forEach((button) => {
|
|
79
88
|
button.onclick = () => {
|
|
80
|
-
|
|
89
|
+
hidePositionToasts()
|
|
81
90
|
let toast = document.querySelector(button.getAttribute("data-toast"))
|
|
82
|
-
|
|
83
91
|
if (toast) {
|
|
84
92
|
toast.style.display = "flex"
|
|
85
93
|
}
|
|
86
94
|
}
|
|
87
95
|
})
|
|
88
96
|
</script>
|
|
89
|
-
|
|
90
|
-
<!-- hiding toast on page load -->
|
|
91
|
-
<style>
|
|
92
|
-
#toast-top-center, #toast-top-right, #toast-top-left, #toast-bottom-center, #toast-bottom-right, #toast-bottom-left {
|
|
93
|
-
display: none;
|
|
94
|
-
}
|
|
95
|
-
</style>
|
|
@@ -8,13 +8,13 @@ const ERROR_MESSAGE_SELECTOR = '.pb_body_kit_negative'
|
|
|
8
8
|
// Validation selectors
|
|
9
9
|
const FORM_SELECTOR = 'form[data-pb-form-validation="true"]'
|
|
10
10
|
const REQUIRED_FIELDS_SELECTOR = 'input[required],textarea[required],select[required]'
|
|
11
|
+
const PHONE_NUMBER_VALIDATION_ERROR_SELECTOR = '[data-pb-phone-validation-error="true"]'
|
|
11
12
|
|
|
12
13
|
const FIELD_EVENTS = [
|
|
13
14
|
'change',
|
|
14
15
|
'valid',
|
|
15
16
|
'invalid',
|
|
16
17
|
]
|
|
17
|
-
|
|
18
18
|
class PbFormValidation extends PbEnhancedElement {
|
|
19
19
|
static get selector() {
|
|
20
20
|
return FORM_SELECTOR
|
|
@@ -22,12 +22,27 @@ class PbFormValidation extends PbEnhancedElement {
|
|
|
22
22
|
|
|
23
23
|
connect() {
|
|
24
24
|
this.formValidationFields.forEach((field) => {
|
|
25
|
+
// Skip phone number inputs - they handle their own validation
|
|
26
|
+
const isPhoneNumberInput = field.closest('.pb_phone_number_input')
|
|
27
|
+
if (isPhoneNumberInput) return
|
|
28
|
+
|
|
25
29
|
FIELD_EVENTS.forEach((e) => {
|
|
26
30
|
field.addEventListener(e, debounce((event) => {
|
|
27
31
|
this.validateFormField(event)
|
|
28
32
|
}, 250), false)
|
|
29
33
|
})
|
|
30
34
|
})
|
|
35
|
+
|
|
36
|
+
// Add event listener to check for phone number validation errors
|
|
37
|
+
this.element.addEventListener('submit', (event) => {
|
|
38
|
+
// Use setTimeout to ensure React state updates have completed
|
|
39
|
+
setTimeout(() => {
|
|
40
|
+
if (this.hasPhoneNumberValidationErrors()) {
|
|
41
|
+
event.preventDefault()
|
|
42
|
+
return false
|
|
43
|
+
}
|
|
44
|
+
}, 0)
|
|
45
|
+
})
|
|
31
46
|
}
|
|
32
47
|
|
|
33
48
|
validateFormField(event) {
|
|
@@ -45,40 +60,58 @@ class PbFormValidation extends PbEnhancedElement {
|
|
|
45
60
|
|
|
46
61
|
showValidationMessage(target) {
|
|
47
62
|
const { parentElement } = target
|
|
63
|
+
const kitElement = parentElement.closest(KIT_SELECTOR)
|
|
64
|
+
|
|
65
|
+
// FIX: Add null check for kitElement
|
|
66
|
+
if (!kitElement) return
|
|
67
|
+
|
|
68
|
+
// Check if this is a phone number input
|
|
69
|
+
const isPhoneNumberInput = kitElement.classList.contains('pb_phone_number_input')
|
|
48
70
|
|
|
49
71
|
// ensure clean error message state
|
|
50
72
|
this.clearError(target)
|
|
51
|
-
|
|
73
|
+
kitElement.classList.add('error')
|
|
52
74
|
|
|
53
|
-
//
|
|
54
|
-
|
|
75
|
+
// Only add error message if it's NOT a phone number input
|
|
76
|
+
if (!isPhoneNumberInput) {
|
|
77
|
+
// set the error message element
|
|
78
|
+
const errorMessageContainer = this.errorMessageContainer
|
|
55
79
|
|
|
56
|
-
|
|
80
|
+
if (target.dataset.message) target.setCustomValidity(target.dataset.message)
|
|
57
81
|
|
|
58
|
-
|
|
82
|
+
errorMessageContainer.innerHTML = target.validationMessage
|
|
59
83
|
|
|
60
|
-
|
|
61
|
-
|
|
84
|
+
// add the error message element to the dom tree
|
|
85
|
+
parentElement.appendChild(errorMessageContainer)
|
|
86
|
+
}
|
|
62
87
|
}
|
|
63
88
|
|
|
64
89
|
clearError(target) {
|
|
65
90
|
const { parentElement } = target
|
|
66
|
-
parentElement.closest(KIT_SELECTOR)
|
|
91
|
+
const kitElement = parentElement.closest(KIT_SELECTOR)
|
|
92
|
+
// Remove error class from kit element
|
|
93
|
+
if (kitElement) kitElement.classList.remove('error')
|
|
94
|
+
// Remove error message from parent element
|
|
67
95
|
const errorMessageContainer = parentElement.querySelector(ERROR_MESSAGE_SELECTOR)
|
|
68
96
|
if (errorMessageContainer) errorMessageContainer.remove()
|
|
69
97
|
}
|
|
70
98
|
|
|
99
|
+
// Check if there are phone number input errors
|
|
100
|
+
hasPhoneNumberValidationErrors() {
|
|
101
|
+
const phoneNumberErrors = this.element.querySelectorAll(PHONE_NUMBER_VALIDATION_ERROR_SELECTOR)
|
|
102
|
+
return phoneNumberErrors.length > 0
|
|
103
|
+
}
|
|
104
|
+
|
|
71
105
|
get errorMessageContainer() {
|
|
72
106
|
const errorContainer = document.createElement('div')
|
|
73
107
|
const kitClassName = ERROR_MESSAGE_SELECTOR.replace(/\./, '')
|
|
74
108
|
errorContainer.classList.add(kitClassName)
|
|
75
109
|
return errorContainer
|
|
76
110
|
}
|
|
77
|
-
|
|
78
111
|
get formValidationFields() {
|
|
79
112
|
return this._formValidationFields =
|
|
80
113
|
this._formValidationFields || this.element.querySelectorAll(REQUIRED_FIELDS_SELECTOR)
|
|
81
114
|
}
|
|
82
115
|
}
|
|
83
116
|
|
|
84
|
-
window.PbFormValidation = PbFormValidation
|
|
117
|
+
window.PbFormValidation = PbFormValidation
|
|
@@ -9,7 +9,7 @@ import { buildDataProps, buildHtmlProps } from '../utilities/props'
|
|
|
9
9
|
|
|
10
10
|
type FormPillProps = {
|
|
11
11
|
className?: string,
|
|
12
|
-
htmlOptions?: {[key: string]: string | number | boolean | (() => void)},
|
|
12
|
+
htmlOptions?: {[key: string]: string | number | boolean | (() => void) | ((event: any) => void) | any},
|
|
13
13
|
id?: string,
|
|
14
14
|
text: string,
|
|
15
15
|
name?: string,
|