diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index 8c390c6e0e..fd5f3f2000 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -34,27 +34,27 @@ }, { "path": "./dist/js/bootstrap.bundle.js", - "maxSize": "43.25 kB" + "maxSize": "44.55 kB" }, { "path": "./dist/js/bootstrap.bundle.min.js", - "maxSize": "22.75 kB" + "maxSize": "23.75 kB" }, { "path": "./dist/js/bootstrap.esm.js", - "maxSize": "28.0 kB" + "maxSize": "29.75 kB" }, { "path": "./dist/js/bootstrap.esm.min.js", - "maxSize": "18.5 kB" + "maxSize": "19.25 kB" }, { "path": "./dist/js/bootstrap.js", - "maxSize": "28.75 kB" + "maxSize": "30.5 kB" }, { "path": "./dist/js/bootstrap.min.js", - "maxSize": "16.25 kB" + "maxSize": "16.75 kB" } ], "ci": { diff --git a/js/src/base-component.js b/js/src/base-component.js index dba5e0742a..12acd2f86c 100644 --- a/js/src/base-component.js +++ b/js/src/base-component.js @@ -36,6 +36,10 @@ class BaseComponent extends Config { } // Public + getElement() { + return this._element + } + dispose() { Data.remove(this._element, this.constructor.DATA_KEY) EventHandler.off(this._element, this.constructor.EVENT_KEY) diff --git a/js/src/forms/form-field.js b/js/src/forms/form-field.js index e8fd5223c5..f2c3a59b53 100644 --- a/js/src/forms/form-field.js +++ b/js/src/forms/form-field.js @@ -20,15 +20,13 @@ const CLASS_FIELD_SUCCESS = 'is-valid' const ARIA_DESCRIBED_BY = 'aria-describedby' const Default = { - invalid: '', // invalid message to add - name: null, - valid: '', // valid message to add + invalid: '', // invalid message to append + valid: '', // valid message to append type: 'feedback' // or tooltip } const DefaultType = { invalid: 'string', - name: 'string', valid: 'string', type: 'string' } @@ -70,10 +68,6 @@ class FormField extends BaseComponent { return MessageTypes } - getElement() { - return this._element - } - clearAppended() { const appendedFeedback = SelectorEngine.findOne(`#${this._tipId}`, this._element.parentNode) if (!appendedFeedback) { @@ -122,6 +116,10 @@ class FormField extends BaseComponent { this._element.setAttribute(ARIA_DESCRIBED_BY, describedBy) return true } + + name() { + return this._element.name || this._element.id + } } export default FormField diff --git a/js/src/forms/form.js b/js/src/forms/form.js index da47037890..6b854281d2 100644 --- a/js/src/forms/form.js +++ b/js/src/forms/form.js @@ -8,6 +8,7 @@ import BaseComponent from '../base-component' import EventHandler from '../dom/event-handler' import FormField from './form-field' import SelectorEngine from '../dom/selector-engine' +import { execute } from '../util/index' const NAME = 'formValidation' const DATA_KEY = 'bs.formValidation' @@ -17,7 +18,7 @@ const EVENT_SUBMIT = `submit${EVENT_KEY}` const EVENT_RESET = `reset${EVENT_KEY}` const CLASS_VALIDATED = 'was-validated' -const SELECTOR_DATA_TOGGLE = 'form[data-bs-toggle="form-validation"]' +const SELECTOR_DATA_TOGGLE = 'form[data-bs-toggle="form"]' const Default = { type: 'feedback', // or 'tooltip' @@ -25,7 +26,8 @@ const Default = { } const DefaultType = { - type: 'string', validateCallback: '(function|null)' + type: 'string', + validateCallback: '(function|null)' } class Form extends BaseComponent { @@ -86,10 +88,6 @@ class Form extends BaseComponent { return false } - getDataForSubmission() { - return new FormData(this._element) - } - _appendErrorToField(field, givenMessage) { const element = field.getElement() @@ -114,19 +112,17 @@ class Form extends BaseComponent { const fields = new Map() const formElements = Array.from(this._element.elements) // the DOM elements for (const element of formElements) { - const name = element.name || element.id - const field = FormField.getOrCreateInstance(element, { - name, type: this._config.type + type: this._config.type }) - fields.set(name, field) + fields.set(field.name(), field) } return fields } _fetchErrors() { - return typeof this._config.validateCallback === 'function' ? this._config.validateCallback(this.getDataForSubmission()) : {} + return execute(this._config.validateCallback, [this], {}) } } diff --git a/site/content/docs/5.2/examples/checkout-rtl/index.html b/site/content/docs/5.2/examples/checkout-rtl/index.html index 44120b272b..b22ef01f43 100644 --- a/site/content/docs/5.2/examples/checkout-rtl/index.html +++ b/site/content/docs/5.2/examples/checkout-rtl/index.html @@ -65,7 +65,7 @@ body_class: "bg-light"

عنوان الفوترة

-
+
diff --git a/site/content/docs/5.2/examples/checkout/checkout.js b/site/content/docs/5.2/examples/checkout/checkout.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/site/content/docs/5.2/examples/checkout/index.html b/site/content/docs/5.2/examples/checkout/index.html index 87b03634bd..29abe7672f 100644 --- a/site/content/docs/5.2/examples/checkout/index.html +++ b/site/content/docs/5.2/examples/checkout/index.html @@ -64,7 +64,7 @@ body_class: "bg-light"

Billing address

- +
diff --git a/site/content/docs/5.2/forms/validation.md b/site/content/docs/5.2/forms/validation.md index 9e8674d593..1df8536c56 100644 --- a/site/content/docs/5.2/forms/validation.md +++ b/site/content/docs/5.2/forms/validation.md @@ -23,12 +23,12 @@ With that in mind, consider the following demos for our custom form validation s ## Custom styles -For custom Bootstrap form validation messages, you'll need to add the data-bs-toggle="form-validation" ``. This disables the browser default feedback tooltips, but still provides access to the form validation APIs in JavaScript. Try to submit the form below; our JavaScript will intercept the submit button and relay feedback to you. When attempting to submit, you'll see the `:invalid` and `:valid` styles applied to your form controls. +For custom Bootstrap form validation messages, you'll need to add the data-bs-toggle="form" ``. This disables the browser default feedback tooltips, but still provides access to the form validation APIs in JavaScript. Try to submit the form below; our JavaScript will intercept the submit button and relay feedback to you. When attempting to submit, you'll see the `:invalid` and `:valid` styles applied to your form controls. Custom feedback styles apply custom colors, borders, focus styles, and background icons to better communicate feedback. Background icons for ` @@ -266,7 +266,7 @@ Validation styles are available for the following form controls and components: If your form layout allows it, you can swap the `.{valid|invalid}-feedback` classes for `.{valid|invalid}-tooltip` classes to display validation feedback in a styled tooltip. Be sure to have a parent with `position: relative` on it for tooltip positioning. In the example below, our column classes have this already, but your project may require an alternative setup. {{< example >}} - +
@@ -333,3 +333,73 @@ Used to iterate over `$form-validation-states` map values to generate our valida ### Customizing Validation states can be customized via Sass with the `$form-validation-states` map. Located in our `_variables.scss` file, this Sass map is how we generate the default `valid`/`invalid` validation states. Included is a nested map for customizing each state's color, icon, tooltip color, and focus shadow. While no other states are supported by browsers, those using custom styles can easily add more complex form feedback. + + +## Usage +### Via data attributes + +To easily add form validation behavior to you form, add `data-bs-toggle="form"` attribute to the `` element. + +### Via JavaScript + +Enable manually with: + +```js +const formElementList = document.querySelectorAll('form') +const formList = [...formElementList].map(formEl => new bootstrap.Form(formEl)) +``` + +### Options + +#### Form +{{< bs-table "table" >}} +| Name | Type | Default | Description | +| --- | --- | --- | --- | +| `type` | string | `feedback` | You may pick the kind of feedback. Acceptable values `tooltip` or `feedback` | +| `validateCallback` | function, null | `null` | A callback to execute while trying to check for errors. Can be use for ajax submissions/validations. | +{{< /bs-table >}} + + +#### Field +{{< bs-table "table" >}} +| Name | Type | Default | Description | +| --- | --- | --- | --- | +| `invalid` | string | `''` | invalid message to append | +| `valid` | string | `''` | valid message to append | +{{< /bs-table >}} + +### Methods + + +You can create a form instance using the constructor, for example: + +```js +const bsForm = new bootstrap.Form('#myForm', { type: 'tooltip' }) +``` + +#### Form +{{< bs-table "table" >}} +| Method | Description | +| --- | --- | +| `getInstance` | *Static* method which allows you to get the form instance associated with a DOM element. | +| `getOrCreateInstance` | *Static* method which allows you to get the form instance associated with a DOM element, or create a new one in case it wasn't initialized. | +| `getElement` | Returns the DOM element of the instance. | +| `getFields` | Returns all form-fields instances of the form. Array\. | +| `getField('name')` | Searches and return the requested FormField instance or undefined. | +| `clear` | Clears all the form validation results. | +| `validate` | Activates validation process. | +{{< /bs-table >}} + +#### Field +{{< bs-table "table" >}} +| Method | Description | +| --- | --- | +| `getInstance` | *Static* method which allows you to get the form Field instance associated with a DOM element | +| `getOrCreateInstance` | *Static* method which allows you to get the form Field instance associated with a DOM element, or create a new one in case it wasn't initialized | +| `getElement` | Returns the DOM element of the instance. | +| `clearAppended` | Clears any appended messages from field. | +| `appendError(message)` | Appends the given message as an error feedback. In case we do not provide a message, it fallbacks to the configuration given `invalid` message. | +| `appendSuccess(message)` | Appends the given message as a success feedback. In case we do not provide a message, it fallbacks to the configuration given `valid` message. | +| `appendFeedback(message)` | Appends the given message as a simple info feedback. | +| `name` | returns the name (fallback to id) of the field as unique identifier between form elements. | +{{< /bs-table >}} diff --git a/site/static/docs/5.2/assets/js/validate-forms.js b/site/static/docs/5.2/assets/js/validate-forms.js deleted file mode 100644 index e69de29bb2..0000000000