Skip to content
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.

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

Next version bump #1825

Merged
merged 39 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a34b46f
docs(icon): updated documentation
pixelflips Oct 16, 2023
ad585e6
docs(icon): add descriptions for props table
pixelflips Oct 17, 2023
245beeb
fix(icon): hello linter my old friend
pixelflips Oct 17, 2023
b1410ee
fix(form section): allow user-defined heading
teenwolfblitzer Sep 26, 2023
46d3fdb
fix(form section): apply heading style
teenwolfblitzer Sep 26, 2023
ddf2f09
docs(select): rails - update the helper desc for select component
monicawheeler Oct 11, 2023
c27096c
docs(select): rails - update preview erb to show new examples and des…
monicawheeler Oct 11, 2023
660bb22
docs(select): rails - update rails to done in the helper file
monicawheeler Oct 11, 2023
f7446e7
docs(select): rails - update the props descriptions
monicawheeler Oct 11, 2023
6e412b3
fix(table): update the helper to order table data based on the schema…
kajabi-bot Oct 20, 2023
59fad64
fix(hero): update large hero max width to full
pixelflips Oct 23, 2023
1791b86
fix(hero): revert
pixelflips Oct 23, 2023
dbaaac5
Merge pull request #1826 from Kajabi/DSS-481_pl-hero-max-width-full
pixelflips Oct 23, 2023
2af60a6
Merge pull request #1818 from Kajabi/docs/pl-docs-icon-react
pixelflips Oct 23, 2023
18fa973
docs(loader): update the react loader documentation
kajabi-bot Oct 11, 2023
b46276a
docs(loader): add additional details for Rails Loader component
kajabi-bot Oct 17, 2023
0b3a6dc
Merge pull request #1804 from Kajabi/DSS-473_react-form-section-title
ju-Skinner Oct 24, 2023
b859c9e
Merge pull request #1812 from Kajabi/docs/update-loader-component-docs
ju-Skinner Oct 24, 2023
f32457a
docs(table): add documentation React PropTypes
kajabi-bot Oct 23, 2023
2bccf51
docs(table): update React table documentation in Storybook
kajabi-bot Oct 23, 2023
1d89206
fix(dropdown): add left and right repositioning for the rails dropdown
QuintonJason Oct 18, 2023
3526e82
fix(dropdown rails): keep dropdown content on the screen
QuintonJason Oct 18, 2023
7d38b2c
fix(dropdown react): add horizontal repositioning to unpinned dropdowns
QuintonJason Oct 18, 2023
80c7d50
chore(dropdown): remove whitespace and console logs
QuintonJason Oct 19, 2023
fcf5537
Merge pull request #1822 from Kajabi/DSS-477/dropdown-horizontal-and-…
QuintonJason Oct 25, 2023
869661b
docs(modal rails): update modal to align with standards set in button…
QuintonJason Oct 11, 2023
847d88b
docs(modal rails): more docs updates to the modal page
QuintonJason Oct 16, 2023
b081a69
docs(modal rails): add header image example
QuintonJason Oct 16, 2023
1e9ace7
docs(modal rails): add divider and update description
QuintonJason Oct 17, 2023
dc6e4b8
docs(modal rails): update footer modal titles and update copy for asy…
QuintonJason Oct 19, 2023
e98ceec
docs(modal rails): update heading levels
QuintonJason Oct 19, 2023
9dc1917
chore(modal): align yarn lock with develop branch
QuintonJason Oct 25, 2023
42dc278
Merge pull request #1811 from Kajabi/docs/modal
QuintonJason Oct 25, 2023
aec75da
Merge pull request #1829 from Kajabi/fix/react-table-schema-order
ju-Skinner Oct 25, 2023
e27ab08
fix(dropdown): fix default inline positioning
teenwolfblitzer Oct 25, 2023
8474664
Merge pull request #1831 from Kajabi/DSS-483_react_dropdown_position_fix
teenwolfblitzer Oct 26, 2023
95f41f8
fix(dropdown): add visual indicator when dropdown is scrollable
QuintonJason Oct 26, 2023
9cd40a5
chore(dropdown): resolve properties order issue
QuintonJason Oct 27, 2023
0f7cbe6
Merge pull request #1832 from Kajabi/DSS-485/dropdown-scrolling-indic…
QuintonJason Oct 27, 2023
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
6 changes: 3 additions & 3 deletions docs/app/helpers/components_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,9 @@ def sage_components
},
{
title: "form_select",
description: "The form select presents a selectable menu of options. The options within the menu are represented by <option> elements.",
description: "The Select component is a user-friendly form control designed to let users pick an option or multiple options from a set. Upon selection, it presents a dialog showcasing all choices in an easily navigable list, with features like added context messages, error indications, and a disabled mode.",
scss: "done",
docs: "todo",
docs: "done",
rails: "done",
react: "todo",
responsive: "todo",
Expand Down Expand Up @@ -567,7 +567,7 @@ def sage_components
},
{
title: "modal",
description: "Sage modal",
description: "Modals are overlays used to display content on a layer above the page, preventing users from interacting with content behind the modal.",
scss: "done",
docs: "done",
rails: "doing",
Expand Down
190 changes: 56 additions & 134 deletions docs/app/views/examples/components/form_select/_preview.html.erb
Original file line number Diff line number Diff line change
@@ -1,178 +1,100 @@
<h3 class="<%= SageClassnames::TYPE::HEADING_6 %>">Default</h3>
<h2>Variants</h2>

<h3>Default</h3>
<p>The Default variation of the Select component is a simple HTML form element.</p>
<%= sage_component SageFormSelect, {
name: "Characters",
id: "characters",
name: "Language",
id: "language",
select_options: [
{
text: "-- Please Select a Character --",
value: "",
},
{
text: "(None Specified)",
value: "",
text: "de - German",
value: "de",
},
{
text: "Mario",
value: "mario",
text: "en - English",
value: "en",
},
{
text: "Luigi",
value: "luigi",
text: "es - Spanish",
value: "es",
},
{
text: "Princess Peach",
value: "princess-peach",
text: "fi - Finnish",
value: "fi",
},
{
text: "Daisy",
value: "daisy",
},
{
text: "Toad",
value: "toad",
text: "fr - French",
value: "fr",
},
],
message: "This is a message"
} %>

<h3 class="<%= SageClassnames::TYPE::HEADING_6 %>">Error state with message and disabled option</h3>
<%= sage_component SageDivider, {} %>

<h3>Select with Message</h3>
<p>The Select component can be used with a message to provide additional context.</p>

<%= sage_component SageFormSelect, {
name: "Pets",
has_error: true,
name: "Default Currency",
select_options: [
{
text: "-- Please Select a Pet --",
value: "",
},
{
text: "(None Specified)",
value: "",
selected: true
},
{
text: "Dog",
value: "dog",
},
{
text: "Cat",
value: "cat",
text: "USD - United States Dollar",
value: "USD",
},
{
text: "Hamster",
value: "hamster",
text: "AED - United Arab Emirates Dirham",
value: "AED",
},
{
text: "Parrot",
value: "parrot",
text: "AFN - Afghan Afghani",
value: "AFN",
},
{
text: "Spider",
value: "spider",
disabled: true
},
{
text: "Goldfish",
value: "goldfish",
text: "ALL - Albanian Lek",
value: "ALL",
},
],
message: "This is a message"
message: "The default currency will be used for formatting and calculation purposes."
} %>

<h3 class="<%= SageClassnames::TYPE::HEADING_6 %>">Disabled (with pre-selected option)</h3>
<%= sage_component SageFormSelect, {
name: "Sports",
disabled: true,
select_options: [
{
text: "Basketball",
value: "basketball"
},
{
text: "Football",
value: "football"
},
{
text: "Lacrosse",
value: "lacrosse"
},
{
text: "Baseball",
value: "baseball",
selected: true
},
{
text: "Blitzball",
value: "blitzball"
},
]
} %>
<%= sage_component SageDivider, {} %>

<h3>Error State</h3>
<p>The Select component can indicate an error state.</p>

<h3 class="<%= SageClassnames::TYPE::HEADING_6 %>">Optgroup use</h3>
<%= sage_component SageFormSelect, {
name: "Sports!",
name: "Text direction",
has_error: true,
select_options: [
{
text: "Bowling",
value: "bowling",
},
{
group_label: "Hand Sports",
group_options: [
{
text: "Football",
value: "football",
},
{
text: "Basketball",
value: "basketball",
},
],
},
{
text: "Nascar",
value: "nascar",
selected: true,
text: "Left to right (ltr)",
value: "ltr",
},
{
group_label: "Foot Sports",
group_options: [
{
text: "Soccer",
value: "soccer",
},
],
text: "Right to left (rtl)",
value: "rtl",
},
]
],
message: "This field is required."
} %>

<script>
const handleOnChange = (consoles) => {
var selectedText = consoles.options[consoles.selectedIndex].innerHTML;
var selectedVal = consoles.value;
alert("Selected Text: " + selectedText + " Value: " + selectedVal);
}
</script>
<h3 class="<%= SageClassnames::TYPE::HEADING_6 %>">Example on how to pass additional attributes to the component</h3>
<%= sage_component SageDivider, {} %>

<h3>Disabled</h3>
<p>The Select component can be marked as disabled. Selects labeled as Disabled will not be submitted in forms.</p>

<%= sage_component SageFormSelect, {
name: "Consoles",
component_attributes: {
onChange: "handleOnChange(this)",
"my-attribute": "hello"
},
name: "Text direction",
disabled: true,
select_options: [
{
text: "X-Box",
value: "x-box"
},
{
text: "PlayStation",
value: "playstation"
text: "Left to right (ltr)",
value: "ltr",
},
{
text: "Nintendo Switch",
value: "switch"
text: "Right to left (rtl)",
value: "rtl",
},
]
],
message: "This field is not available until you select a language."
} %>

<p><strong>Note:</strong> For a fully styled dropdown selector, see the Dropdown component.</p>
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<tr>
<td><%= md('`disabled`') %></td>
<td><%= md('Enabling this property adds the `disabled` attribute to the component. <br>⚠️ `disabled` inputs are not submitted in forms.') %></td>
<td><%= md('Enabling this property adds the `disabled` attribute to the component. `disabled` inputs are not submitted in forms.') %></td>
<td><%= md('Boolean') %></td>
<td><%= md('`false`') %></td>
</tr>
<tr>
<td><%= md('`has_error`') %></td>
<td><%= md('Enabling this property adds the `.sage-form-field--error` class to the component.') %></td>
<td><%= md('Enabling this property styles the select in the default danger color theme.') %></td>
<td><%= md('Boolean') %></td>
<td><%= md('`false`') %></td>
</tr>
<tr>
<td><%= md('`message`') %></td>
<td><%= md('Sets the message text for the component.') %></td>
<td><%= md('Displays the message text for the component.') %></td>
<td><%= md('String') %></td>
<td><%= md('`nil`') %></td>
</tr>
Expand Down
57 changes: 38 additions & 19 deletions docs/app/views/examples/components/loader/_preview.html.erb
Original file line number Diff line number Diff line change
@@ -1,29 +1,48 @@
<h2 class="<%= SageClassnames::TYPE::HEADING_6 %>">Without text</h2>
<div class="sage-row">
<div class="sage-col--md-6 example__block--lg">
<h2>Variants</h2>

<h3>Bar</h3>
<%= sage_component SageGridRow, {} do %>
<%= sage_component SageGridCol, { size: 12, css_classes: "example__block--lg" } do %>
<%= sage_component SageLoader, {
type: "spinner"
type: "bar"
} %>
</div>
<div class="sage-col--md-6 example__block--lg">
<%= sage_component SageLoader, {
type: "success"
} %>
</div>
</div>
<hr>
<h2 class="<%= SageClassnames::TYPE::HEADING_6 %>">With text</h2>
<div class="sage-row">
<div class="sage-col--md-6 example__block--lg">
<% end %>
<% end %>

<%= sage_component SageDivider, {} %>

<h3>Spinner</h3>
<%= sage_component SageGridRow, {} do %>
<%= sage_component SageGridCol, { size: 6, css_classes: "example__block--lg" } do %>
<h2 class="<%= SageClassnames::TYPE::HEADING_6 %>">With text</h2>
<%= sage_component SageLoader, {
type: "spinner",
text: true
} %>
</div>
<div class="sage-col--md-6 example__block--lg">
<% end %>
<%= sage_component SageGridCol, { size: 6, css_classes: "example__block--lg" } do %>
<h2 class="<%= SageClassnames::TYPE::HEADING_6 %>">Without text</h2>
<%= sage_component SageLoader, {
type: "spinner"
} %>
<% end %>
<% end %>

<%= sage_component SageDivider, {} %>

<h3>Success</h3>
<%= sage_component SageGridRow, {} do %>
<%= sage_component SageGridCol, { size: 6, css_classes: "example__block--lg" } do %>
<h2 class="<%= SageClassnames::TYPE::HEADING_6 %>">With text</h2>
<%= sage_component SageLoader, {
type: "success",
text: true
} %>
</div>
</div>
<% end %>
<%= sage_component SageGridCol, { size: 6, css_classes: "example__block--lg" } do %>
<h2 class="<%= SageClassnames::TYPE::HEADING_6 %>">Without text</h2>
<%= sage_component SageLoader, {
type: "success"
} %>
<% end %>
<% end %>
15 changes: 11 additions & 4 deletions docs/app/views/examples/components/loader/_props.html.erb
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
<tr>
<td><%= md('`type`') %><%= sage_component SageBadge, { color: "published", value: "required" } %></td>
<td><%= md('Determines which loader will be used; `spinner` or `success`') %></td>
<td><%= md('String') %></td>
<td><%= md('`nil`') %></td>
<td><%= md('`fill`') %>
<td><%= md('If true, will fill the space within the container.') %></td>
<td><%= md('Boolean') %></td>
<td><%= md('`false`') %></td>
</tr>
<tr>
<td><%= md('`text`') %></td>
<td><%= md('Includes text that aligns with the loader.') %></td>
<td><%= md('Boolean') %></td>
<td><%= md('`false`') %></td>
</tr>
<tr>
<td><%= md('`type`') %><%= sage_component SageBadge, { color: "published", value: "required" } %></td>
<td><%= md('Determines which loader will be used; `bar`, `spinner` or `success`') %></td>
<td><%= md('String') %></td>
<td><%= md('`nil`') %></td>
</tr>

Loading
Loading