Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions src/components/base-address/BaseAddress.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,21 @@ FilledCountryInBaseAddress['args'] = {
noPoBox: true,
isInactive: false
}

export const Latin1RestrictedBaseAddress = Template.bind({})
Latin1RestrictedBaseAddress['args'] = {
editing: true,
schema: PersonAddressSchema,
address: {
streetAddress: '1234 Sesame Street',
streetAddressAdditional: '4th Floor',
addressCity: 'Montréal',
addressRegion: 'Quebec',
addressCountry: 'CA',
postalCode: 'H2X 1Y4',
deliveryInstructions: 'Leave at front door'
},
noPoBox: true,
isInactive: false,
requireLatin1: true
}
30 changes: 24 additions & 6 deletions src/components/base-address/BaseAddress.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
:hint="streetAddressHint"
persistent-hint
:label="streetAddressLabel"
:rules="[...rules.streetAddress, ...spaceRules]"
:rules="[...rules.streetAddress, ...spaceRules, ...latin1Rules]"
@keypress.once="enableAddressComplete()"
@click="enableAddressComplete()"
/>
Expand All @@ -99,7 +99,7 @@
class="street-address-additional"
:label="streetAddressAdditionalLabel"
rows="1"
:rules="[...rules.streetAddressAdditional, ...spaceRules]"
:rules="[...rules.streetAddressAdditional, ...spaceRules, ...latin1Rules]"
/>
</div>
<div class="form__row three-column">
Expand All @@ -108,7 +108,7 @@
filled
class="item address-city"
:label="addressCityLabel"
:rules="[...rules.addressCity, ...spaceRules]"
:rules="[...rules.addressCity, ...spaceRules, ...latin1Rules]"
/>
<v-select
v-if="useCountryRegions(addressCountry)"
Expand All @@ -129,14 +129,14 @@
filled
class="item address-region"
:label="addressRegionLabel"
:rules="[...rules.addressRegion, ...spaceRules]"
:rules="[...rules.addressRegion, ...spaceRules, ...latin1Rules]"
/>
<v-text-field
v-model="addressLocal.postalCode"
filled
class="item postal-code"
:label="postalCodeLabel"
:rules="postalCodeRulesEnabled ? [...rules.postalCode, ...spaceRules] : []"
:rules="postalCodeRulesEnabled ? [...rules.postalCode, ...spaceRules, ...latin1Rules] : [...latin1Rules]"
@input="addressLocal.postalCode = addressLocal.postalCode?.toUpperCase()"
@blur="postalCodeRulesEnabled = true"
/>
Expand All @@ -149,7 +149,7 @@
class="delivery-instructions"
:label="deliveryInstructionsLabel"
rows="2"
:rules="[...rules.deliveryInstructions, ...spaceRules]"
:rules="[...rules.deliveryInstructions, ...spaceRules, ...latin1Rules]"
/>
</div>
</v-form>
Expand Down Expand Up @@ -228,6 +228,10 @@ export default class BaseAddress extends Mixins(ValidationMixin, CountriesProvin
@Prop({ default: false })
readonly isInactive: boolean

/** Whether to restrict address fields to the Latin-1 (ISO-8859-1) character set. */
@Prop({ default: false })
readonly requireLatin1: boolean

/** Called, possibly externally, to validate all registered form inputs. */
public async validate (): Promise<boolean> {
this.postalCodeRulesEnabled = true
Expand Down Expand Up @@ -376,6 +380,20 @@ export default class BaseAddress extends Mixins(ValidationMixin, CountriesProvin
v => !/\s\s/g.test(v) || 'Invalid word spacing' // multiple inline spaces
]

/**
* Array of validation rules to restrict input to the Latin-1 (ISO-8859-1) character set.
* Enabled only when the requireLatin1 prop is set, so existing consumers are unaffected.
* Accepts Latin-1 accented characters (eg, é, à, ç) but rejects anything outside that
* range (eg, CJK/Chinese characters), whether typed or pasted.
*/
get latin1Rules (): Array<(v: string) => boolean | string> {
if (!this.requireLatin1) return []
return [
// eslint-disable-next-line no-control-regex
v => !v || /^[\u0000-\u00ff]*$/.test(v) || 'Invalid character(s)'
]
}

/**
* The Vuetify rules object. Used to display any validation errors/styling.
* NB: As a getter, this is initialized between created() and mounted().
Expand Down
Loading