Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
defd33e
Add a toggle to between Entries and Summary
jaygeorge Jun 25, 2026
0ca55d4
Prevent "Customizing Columns" overlapping the Entries/Summry view option
jaygeorge Jun 25, 2026
22ae732
Move the view to the end
jaygeorge Jun 25, 2026
12610e0
Move the toggle to a different position because it's a bit awkward cl…
jaygeorge Jun 25, 2026
1b952b2
Add data visualisation icon
jaygeorge Jun 25, 2026
01896ad
Hmm move it back. Let's try something else
jaygeorge Jun 26, 2026
0a9518d
Undo some previous layout changes, ready to accept a v6 merge
jaygeorge Jun 26, 2026
71c72dc
Merge branch '6.x' into forms-2-visualize-responses
jaygeorge Jun 26, 2026
0062135
Move entries/summary view back into its position
jaygeorge Jun 26, 2026
b0cf292
Match the new layout of Listing.vue in collections
jaygeorge Jun 26, 2026
763f84c
Filters - small improvement to overflow clipping so keyboard focus ri…
jaygeorge Jun 26, 2026
8d6632b
Remember view preference for entries/summary toggle
jaygeorge Jun 26, 2026
8509c49
wip - pie chart demo
jaygeorge Jun 26, 2026
17b935f
wip - pie chart demo
jaygeorge Jun 26, 2026
1e67e7b
wip - pie chart demo / some accessibility considerations
jaygeorge Jun 26, 2026
d31ac5b
Make widget heading text a tiny bit less dominant
jaygeorge Jun 29, 2026
e1b841a
Option for displaying pie chart labels
jaygeorge Jun 29, 2026
088ef84
Revert "Option for displaying pie chart labels" - I don't think this …
jaygeorge Jun 29, 2026
ed4ba70
This can just be Tailwind for now
jaygeorge Jun 29, 2026
53a0351
Lollipop graph draft
jaygeorge Jun 29, 2026
03eb5f7
Lollipop graph - tidy
jaygeorge Jun 29, 2026
20d99f0
Pie chart - add hover labels
jaygeorge Jun 29, 2026
f74d496
Pie chart - start building pagination demo
jaygeorge Jun 29, 2026
0b380b6
Pie chart - finish pagination demo
jaygeorge Jun 29, 2026
3e3b94a
Make charts themeable
jaygeorge Jun 29, 2026
4419e24
Pie chart - improve single digit alignment
jaygeorge Jun 29, 2026
30acfd9
Charts - improve dark mode
jaygeorge Jun 29, 2026
b9241a1
Charts - improve chart legend
jaygeorge Jun 29, 2026
2be69cd
Charts - improve theming
jaygeorge Jun 29, 2026
7047d1b
Charts - add min height
jaygeorge Jun 29, 2026
46e0ab9
Charts - wip
jaygeorge Jun 29, 2026
69e7995
Add link from "other" to next page
jaygeorge Jun 29, 2026
0dc49bc
Dropdown field type - draft
jaygeorge Jun 30, 2026
96a812d
Dropdown field type - finish
jaygeorge Jun 30, 2026
151a7f4
Change the way we handle layout for the text in bar charts, so that w…
jaygeorge Jun 30, 2026
a815c7d
Change the way we handle layout for the text in lollipop charts, so t…
jaygeorge Jun 30, 2026
6700a46
Opinion field type - start
jaygeorge Jun 30, 2026
2b03af0
Tidy accessibility
jaygeorge Jun 30, 2026
9e39f0d
Opinion field type - draft
jaygeorge Jun 30, 2026
b54877b
Opinion field type - move the numbers down to the bar
jaygeorge Jun 30, 2026
bd6ae73
Opinion field type - wip
jaygeorge Jun 30, 2026
a9a08f9
Opinion field type - tidy
jaygeorge Jun 30, 2026
280ea54
Opinion field type - tidy
jaygeorge Jun 30, 2026
d9e4836
Vertical Bar Chart - Cleaner separation between native CSS / TW
jaygeorge Jun 30, 2026
6d56998
Pie Chart - Cleaner separation between native CSS / TW
jaygeorge Jun 30, 2026
51cd3e5
Charts - tighten up spacing a touch
jaygeorge Jun 30, 2026
beef49b
Image Choice Field Type - start
jaygeorge Jun 30, 2026
e67245b
Image Choice Field Type - start
jaygeorge Jun 30, 2026
2f6a785
Image Choice Field Type - finish
jaygeorge Jun 30, 2026
728a79e
Image Choice Field Type / Pie Chart - start
jaygeorge Jun 30, 2026
4af81d7
Image Choice Field Type / Pie Chart - wip
jaygeorge Jun 30, 2026
e43cc67
Image Choice Field Type / Pie Chart - wip
jaygeorge Jun 30, 2026
0ac7e17
Image Choice Field Type / Pie Chart - wip
jaygeorge Jun 30, 2026
2a4f79b
Image Choice Field Type / Pie Chart - wip
jaygeorge Jun 30, 2026
c3ffe13
Image Choice Field Type / Pie Chart - wip
jaygeorge Jun 30, 2026
8993a58
Image Choice Field Type / Pie Chart - tidy
jaygeorge Jun 30, 2026
9d34007
Image Choice Field Type / Pie Chart - fix accessibility
jaygeorge Jun 30, 2026
ae34f82
Image Choice Field Type / Pie Chart - accessibility improvements
jaygeorge Jun 30, 2026
16edfc6
Image Choice Field Type / Pie Chart - remove color overlay
jaygeorge Jun 30, 2026
ccc3721
Image Choice Field Type / Pie Chart - add chart toggle
jaygeorge Jun 30, 2026
8e46997
Checkboxes Field Type - wip
jaygeorge Jun 30, 2026
249f766
Checkboxes Field Type - wip
jaygeorge Jun 30, 2026
f14d7fa
Checkboxes Field Type - wip
jaygeorge Jun 30, 2026
949b5df
Checkboxes Field Type - finish
jaygeorge Jun 30, 2026
49e4376
Yes / No Field Type - start
jaygeorge Jun 30, 2026
854f0d8
Adjust spacing slightly
jaygeorge Jun 30, 2026
da18066
Yes / No Field Type - add pie chart option
jaygeorge Jun 30, 2026
3a918bf
Dictionary Field Type - wip
jaygeorge Jun 30, 2026
52a3ebb
Dictionary Field Type - wip
jaygeorge Jun 30, 2026
a97fee9
Dictionary Field Type - fix alignment
jaygeorge Jun 30, 2026
fd6f4f2
Dictionary Field Type - tidy
jaygeorge Jun 30, 2026
7c4d0de
Number Field Type - start
jaygeorge Jul 1, 2026
3e55aa3
Charts - consistent optical alignment
jaygeorge Jul 1, 2026
3f0a0c0
Consistent class order
jaygeorge Jul 1, 2026
00e7374
Organise classes by layout > spacing > decoration
jaygeorge Jul 1, 2026
5a32e3a
Number Field Type - wip
jaygeorge Jul 1, 2026
928de27
Number Field Type - finish
jaygeorge Jul 1, 2026
667f867
Star Rating Field Type - start
jaygeorge Jul 1, 2026
df11676
Star Rating Field Type - wip
jaygeorge Jul 1, 2026
4e93254
Star Rating Field Type - wip
jaygeorge Jul 1, 2026
f4203be
Star Rating Field Type - finish
jaygeorge Jul 1, 2026
4d251de
Star Rating Field Type - add paginated demo
jaygeorge Jul 1, 2026
e095029
Small fixes
jaygeorge Jul 1, 2026
4577d7e
Toggle Field Type - wip
jaygeorge Jul 1, 2026
f27177f
Fix alignment bits
jaygeorge Jul 1, 2026
2ada3b1
Toggle Field Type - wip
jaygeorge Jul 1, 2026
df5bed3
Toggle Field Type - finish
jaygeorge Jul 1, 2026
762d745
Tweak alignment for bar charts
jaygeorge Jul 1, 2026
4b4a87f
Tweak alignment for bar charts
jaygeorge Jul 1, 2026
d8e97d9
Charts / add animation for switching chart types - pie chart
jaygeorge Jul 1, 2026
67d2d9a
Charts / add animation for switching chart types - bar chart
jaygeorge Jul 1, 2026
6cc212e
Charts / add animation for switching chart types - make more repeatable
jaygeorge Jul 1, 2026
208e04f
Charts / add animation for switching chart types - speed up bar anima…
jaygeorge Jul 1, 2026
6c7d8cd
Charts / add animation for switching chart types - speed up pie chart…
jaygeorge Jul 1, 2026
b28e5fb
Charts / add animation for switching chart types - nah actually
jaygeorge Jul 2, 2026
7d9424d
Add a small helper attribute for the toggle group to show it has been…
jaygeorge Jul 2, 2026
e9fad36
Greatly simplify chart animation by using has and querying whether th…
jaygeorge Jul 2, 2026
ea6ea60
Remove a load of JS data arrays so it's a nice flat comp for Dunc to …
jaygeorge Jul 2, 2026
8ffb801
Merge branch 'forms-2' into forms-2-visualize-responses
jaygeorge Jul 2, 2026
aba2e87
Add a display mode for responses
jaygeorge Jul 2, 2026
85492a8
Dark pass
jaygeorge Jul 2, 2026
a898655
Dark pass
jaygeorge Jul 2, 2026
3c94813
Dark pass
jaygeorge Jul 2, 2026
7b8fa1e
Dark pass
jaygeorge Jul 2, 2026
794715f
Chart themes
jaygeorge Jul 2, 2026
7f6b00c
Merge branch 'forms-2' into forms-2-visualize-responses
jaygeorge Jul 2, 2026
68587f6
Bring over field numbers control (not working because of static mockup)
jaygeorge Jul 2, 2026
3b960c7
Switch to a vertical bar chart for stars when greater than 5 star rating
jaygeorge Jul 3, 2026
f5b7f12
Responsive tweaks
jaygeorge Jul 3, 2026
a1e58db
Create a hook for classes inside a button
jaygeorge Jul 3, 2026
84672b1
Hide the filter text with an sr class for mobile
jaygeorge Jul 3, 2026
b204ef8
Add flex-wrap to filter layout so that it doesn't cause overflow on m…
jaygeorge Jul 3, 2026
23424fa
Consistent spacing
jaygeorge Jul 3, 2026
767c098
Merge branch 'forms-2' into forms-2-visualize-responses
jaygeorge Jul 7, 2026
fcafe9c
Restore some things lost in the merge
jaygeorge Jul 7, 2026
4567376
merge forms-2 into forms-2-visualize-responses
duncanmcclean Aug 18, 2026
ddd79e7
add reusable chart components
duncanmcclean Aug 18, 2026
f928ae3
fix chart styles in storybook
duncanmcclean Aug 18, 2026
f0dc52c
refine chart visualizations
duncanmcclean Aug 18, 2026
fd61bb8
merge `ImagePieChart` into the main `PieChart` component
duncanmcclean Aug 26, 2026
96c3bcc
Merge branch 'forms-2' into forms-2-visualize-responses
duncanmcclean Aug 26, 2026
04b7955
clean up chart ui components
duncanmcclean Aug 26, 2026
69cb0f5
add `Chart` and `Insight` extension types for form summaries`
duncanmcclean Aug 26, 2026
7c9496a
opt fieldtypes into the submission summary
duncanmcclean Aug 26, 2026
519ef4e
add form submission summary and chart layout endpoints
duncanmcclean Aug 26, 2026
0a09004
registration of chart types and insights
duncanmcclean Aug 26, 2026
a03a80f
test to ensure charts can be saved and hydrated
duncanmcclean Aug 26, 2026
3a84bce
chart and insight tests
duncanmcclean Aug 26, 2026
24aea1c
mock `statamic/forms-pro` being installed in view submissions test
duncanmcclean Aug 26, 2026
e7ab2e8
Merge branch 'forms-2' into forms-2-visualize-responses
duncanmcclean Aug 28, 2026
04417a3
Merge branch 'forms-2' into forms-2-visualize-responses
duncanmcclean Aug 28, 2026
4024e77
revert changes to listing components
duncanmcclean Aug 28, 2026
cb92e75
translate validation errors
duncanmcclean Aug 28, 2026
a30d3fb
avoid assumption that all chart components will start with `ui-`
duncanmcclean Aug 28, 2026
84c06f7
insight vue components
duncanmcclean Aug 28, 2026
a16e8fa
finish wiring up the summary view
duncanmcclean Aug 28, 2026
d31a855
add trans import
duncanmcclean Aug 28, 2026
e459d8b
wip
duncanmcclean Aug 28, 2026
deea1c4
wip
duncanmcclean Aug 28, 2026
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
3 changes: 2 additions & 1 deletion .storybook/storybook.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@import '../resources/css/ui.css';
@import '../resources/css/core/utilities.css';
@import '../resources/css/elements/tables.css';
@import '../resources/css/components/forms/charts.css';
@import '../resources/css/components/stacks.css';
@custom-variant dark (&:where(.dark, .dark *));

Expand Down Expand Up @@ -332,4 +333,4 @@
.sbdocs-preview {
border-radius: 17px;
}
}
}
24 changes: 24 additions & 0 deletions .storybook/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ manually copy them here.
--theme-color-ui-accent-bg: oklch(0.457 0.24 277.023);
--theme-color-ui-accent-text: var(--theme-color-ui-accent-bg);
--theme-color-switch-bg: var(--theme-color-ui-accent-bg);
--theme-color-chart-1: oklch(0.585 0.233 277.117);
--theme-color-chart-2: oklch(0.274 0.006 286.033);
--theme-color-chart-3: oklch(0.768 0.233 130.85);
--theme-color-chart-4: oklch(0.87 0.065 274.039);
--theme-color-chart-1-label-bg: oklch(0.511 0.262 276.966);
--theme-color-chart-2-label-bg: transparent;
--theme-color-chart-3-label-bg: oklch(0.648 0.2 131.684);
--theme-color-chart-4-label-bg: oklch(0.673 0.182 276.935);
--theme-color-chart-1-legend: oklch(0.585 0.233 277.117);
--theme-color-chart-2-legend: oklch(0.274 0.006 286.033);
--theme-color-chart-3-legend: oklch(0.768 0.233 130.85);
--theme-color-chart-4-legend: oklch(0.785 0.115 274.713);

--z-index-below: -1;
--z-index-above: 1;
Expand All @@ -45,6 +57,18 @@ manually copy them here.
--theme-color-content-bg: oklch(0.21 0.006 285.885);
--theme-color-content-border: oklch(0.141 0.005 285.823);
--theme-color-ui-accent-text: oklch(0.673 0.182 276.935);
--theme-color-chart-1: oklch(0.511 0.262 276.966);
--theme-color-chart-2: oklch(0.87 0.065 274.039);
--theme-color-chart-3: oklch(0.768 0.233 130.85);
--theme-color-chart-4: oklch(0.141 0.005 285.823);
--theme-color-chart-1-label-bg: oklch(0.457 0.24 277.023);
--theme-color-chart-2-label-bg: oklch(0.673 0.182 276.935);
--theme-color-chart-3-label-bg: oklch(0.648 0.2 131.684);
--theme-color-chart-4-label-bg: oklch(0.37 0.013 285.805);
--theme-color-chart-1-legend: oklch(0.511 0.262 276.966);
--theme-color-chart-2-legend: oklch(0.87 0.065 274.039);
--theme-color-chart-3-legend: oklch(0.768 0.233 130.85);
--theme-color-chart-4-legend: oklch(0.141 0.005 285.823);
}
}

3 changes: 3 additions & 0 deletions lang/en/messages.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@
'form_fields_handle_instructions' => 'Auto-generated from the label. It can\'t be changed after saving the form.',
'form_fields_instructions_instructions' => 'Additional field instructions like this.',
'form_navigation' => 'Form navigation',
'form_summary_add_chart_instructions' => 'Add a chart to start summarizing responses.',
'form_summary_checked_insight' => 'of users checked the toggle',
'form_summary_save_to_see_chart' => 'Save to see this chart.',
'getting_started_widget_collections' => 'Collections hold the different content types that make up your site, helping you stay organized.',
'getting_started_widget_docs' => 'Discover everything Statamic can do, and learn how to use its powerful features the right way.',
'getting_started_widget_header' => 'Getting Started with Statamic',
Expand Down
3 changes: 3 additions & 0 deletions lang/en/validation.php
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@
'elevated_session_verification_code' => 'The verification code is incorrect.',
'email_available' => 'A user with this email already exists.',
'fieldset_imported_recursively' => 'Fieldset :handle is being imported recursively.',
'form_chart_hidden_field' => 'Field :field is hidden and cannot be charted.',
'form_chart_unknown_chart' => 'Chart :chart does not exist.',
'form_chart_unknown_field' => 'Field :field does not exist on this form.',
'one_site_without_origin' => 'At least one site must not have an origin.',
'options_require_keys' => 'All options must have keys.',
'origin_cannot_be_disabled' => 'Cannot select a disabled origin.',
Expand Down
4 changes: 4 additions & 0 deletions packages/cms/src/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ export const {
Field,
Header,
Heading,
HorizontalBarChart,
HorizontalLollipopChart,
HoverCard,
Icon,
Input,
Expand Down Expand Up @@ -78,6 +80,7 @@ export const {
Panel,
PanelFooter,
PanelHeader,
PieChart,
Popover,
PublishComponents,
PublishContainer,
Expand Down Expand Up @@ -127,6 +130,7 @@ export const {
Timezones,
ToggleGroup,
ToggleItem,
VerticalBarChart,
Widget,
registerIconSet,
registerIconSetFromStrings,
Expand Down
Loading
Loading