@volverjs/ui-vue 0.0.3-beta.4 → 0.0.4

package/dist/components/VvCheckboxGroup/VvCheckboxGroup.umd.js

@@ -1 +1 @@
-(function(e,x){typeof exports=="object"&&typeof module<"u"?module.exports=x(require("vue"),require("nanoid")):typeof define=="function"&&define.amd?define(["vue","nanoid"],x):(e=typeof globalThis<"u"?globalThis:e||self,e.VvCheckboxGroup=x(e.vue,e.nanoid))})(this,function(e,x){"use strict";const G="VV_CHECK_GROUP";function P(r){return Array.isArray(r)?r.filter(m=>isString(m)).join(" "):r}function N(r,m){const{invalid:t,valid:f,hint:l,loading:d}=m,{hintLabel:o,modelValue:b,valid:p,validLabel:n,invalid:c,invalidLabel:a,...V}=toRefs(r),s=resolveFieldData(V,"loading"),u=resolveFieldData(V,"loadingLabel"),v=computed(()=>c.value?!!(c.value&&t||a!=null&&a.value&&Array.isArray(a.value)&&a.value.length>0||a!=null&&a.value&&!isEmpty(a)):!1),i=computed(()=>!!(o&&o.value||l)),k=computed(()=>!!(n&&n.value||f)),g=computed(()=>!!(s!=null&&s.value&&d||s!=null&&s.value&&(u!=null&&u.value))),C=computed(()=>i.value||k.value||v.value||g.value);return{hasInvalid:v,hasHint:i,hasValid:k,hasLoading:g,HintSlot:{name:"HintSlot",props:{params:{type:Object,default:()=>({})}},setup(A){const B=computed(()=>{const S=toReactive({hintLabel:o,modelValue:b,valid:p,validLabel:n,invalid:c,invalidLabel:a,loading:s,loadingLabel:u,...A.params});return c!=null&&c.value?(t==null?void 0:t(S))||P(a==null?void 0:a.value)||(o==null?void 0:o.value):p!=null&&p.value?(f==null?void 0:f(S))||P(n==null?void 0:n.value)||(o==null?void 0:o.value):s!=null&&s.value?(d==null?void 0:d(S))||P(u==null?void 0:u.value)||(o==null?void 0:o.value):(l==null?void 0:l(S))||P(o==null?void 0:o.value)||(o==null?void 0:o.value)});return{isVisible:C,hasInvalid:v,hasValid:k,hintContent:B}},render(){if(this.isVisible)return h("small",{role:this.hasInvalid||this.hasValid?"alert":void 0},this.hintContent)}}}}const E={valid:Boolean,validLabel:[String,Array]},R={invalid:Boolean,invalidLabel:[String,Array]},I={disabled:Boolean},O={readonly:Boolean},H={hintLabel:{type:String,default:""}},w={options:{type:Array,default:()=>[]},labelKey:{type:[String,Function],default:"label"},valueKey:{type:[String,Function],default:"value"}},$={...{id:[String,Number],name:{type:String,required:!0}},...{tabindex:{type:[String,Number],default:0}},...E,...R,...H,...I,...O,value:[String,Number,Boolean],modelValue:[Object,Number,Boolean,String],label:String},D={...E,...R,...w,...H,...I,...O,modelValue:[String,Array],label:String,name:{type:String,required:!0},vertical:Boolean},j={...$,indeterminate:Boolean,uncheckedValue:[String,Number,Boolean],switch:Boolean},F=["click","update:modelValue","change","blur"];function M(r,m){const{group:t,isInGroup:f,getGroupOrLocalRef:l}=useInjectedGroupState(G),{switch:d,indeterminate:o}=toRefs(r),b=l("modelValue",r,m),p=l("readonly",r),n=l("disabled",r),c=l("valid",r),a=l("invalid",r);return{propsSwitch:d,indeterminate:o,group:t,isInGroup:f,modelValue:b,readonly:p,disabled:n,valid:c,invalid:a}}const T=["for"],q=["id","name","disabled","value","tabindex","aria-invalid"],K={name:"VvCheckbox"},z=e.defineComponent({...K,props:j,emits:F,setup(r,{emit:m}){const t=r,f=useSlots(),{disabled:l,readonly:d,valid:o,invalid:b,propsSwitch:p,modelValue:n,indeterminate:c,isInGroup:a}=M(t,m),V=computed(()=>String(t.id||x.nanoid())),s=computed(()=>i.value?-1:t.tabindex),u=ref(),v=computed(()=>t.uncheckedValue!==void 0&&!a.value),i=computed(()=>l.value||d.value),k=computed(()=>{if(b.value===!0)return!0;if(o.value===!0)return!1}),g=computed(()=>v.value?n.value===t.value:Array.isArray(n.value)?contains(t.value,n.value):equals(t.value,n.value)),C=computed(()=>!!(c.value||!g.value&&v.value&&t.uncheckedValue!==n.value)),A=computed(()=>{if(!v.value)return["string","number","boolean"].includes(typeof t.value)?t.value:!0}),B=computed({get(){return g.value},set(y){if(v.value)n.value=y?t.value:t.uncheckedValue;else if(Array.isArray(n.value)||a.value){const _=new Set(Array.isArray(n.value)?n.value:n.value!==void 0?[n.value]:[]);y?_.add(t.value):_.delete(t.value),n.value=[..._]}else n.value=y?t.value:void 0;m("change",y)}}),{bemCssClasses:S}=useBemModifiers("vv-checkbox",{switch:p,valid:o,invalid:b,disabled:l,readonly:d,indeterminate:c});watchEffect(()=>{v.value&&Array.isArray(n.value)&&console.warn("[VvCheckbox] The model value is an array but the component is in binary mode.")}),watch(()=>C.value,y=>{y?u.value.indeterminate=!0:u.value.indeterminate=!1}),onMounted(()=>{C.value&&(u.value.indeterminate=!0)});const{HintSlot:Y}=N(t,f);return(y,_)=>(e.openBlock(),e.createElementBlock("label",{class:e.normalizeClass(e.unref(S)),for:e.unref(V)},[e.withDirectives(e.createElementVNode("input",{id:e.unref(V),ref_key:"input",ref:u,"onUpdate:modelValue":_[0]||(_[0]=Z=>e.isRef(B)?B.value=Z:null),type:"checkbox",class:"vv-checkbox__input",name:y.name,disabled:e.unref(i),value:e.unref(A),tabindex:e.unref(s),"aria-invalid":e.unref(k)},null,8,q),[[e.vModelCheckbox,e.unref(B)]]),e.renderSlot(y.$slots,"default",{value:e.unref(n)},()=>[e.createTextVNode(e.toDisplayString(y.label),1)]),e.createVNode(e.unref(Y),{class:"vv-checkbox__hint",params:{value:e.unref(n)}},null,8,["params"])],10,T))}}),U=D,J=["update:modelValue","change"],Q=["textContent"],W={class:"vv-checkbox-group__wrapper"},X={name:"VvCheckboxGroup"};return e.defineComponent({...X,props:U,emits:J,setup(r,{emit:m}){const t=r,f=useSlots(),l=useVModel(t,"modelValue",m),{disabled:d,readonly:o,vertical:b,valid:p,invalid:n}=toRefs(t),c={key:G,modelValue:l,disabled:d,readonly:o,valid:p,invalid:n};useProvideGroupState(c);const{getOptionLabel:a,getOptionValue:V}=useOptions(t),{bemCssClasses:s}=useBemModifiers("vv-checkbox-group",{disabled:d,readonly:o,horizontal:computed(()=>!b.value),valid:p,invalid:n}),u=(i,k)=>({id:`${t.name}_opt${k}`,name:t.name,label:a(i),value:V(i)}),{HintSlot:v}=N(t,f);return(i,k)=>(e.openBlock(),e.createElementBlock("fieldset",{class:e.normalizeClass(e.unref(s))},[i.label?(e.openBlock(),e.createElementBlock("legend",{key:0,textContent:e.toDisplayString(i.label)},null,8,Q)):e.createCommentVNode("",!0),e.createElementVNode("div",W,[i.options.length>0?(e.openBlock(!0),e.createElementBlock(e.Fragment,{key:0},e.renderList(i.options,(g,C)=>(e.openBlock(),e.createBlock(z,e.mergeProps({key:C},u(g,C)),null,16))),128)):e.renderSlot(i.$slots,"default",{key:1})]),e.createVNode(e.unref(v),{class:"vv-checkbox-group__hint"})],2))}})});
+(function(t,O){typeof exports=="object"&&typeof module<"u"?module.exports=O(require("vue"),require("@vueuse/core"),require("nanoid")):typeof define=="function"&&define.amd?define(["vue","@vueuse/core","nanoid"],O):(t=typeof globalThis<"u"?globalThis:t||self,t.VvCheckboxGroup=O(t.vue,t.core,t.nanoid))})(this,function(t,O,J){"use strict";var A=(e=>(e.left="left",e.right="right",e.top="top",e.bottom="bottom",e))(A||{}),$=(e=>(e.topStart="top-start",e.topEnd="top-end",e.bottomStart="bottom-start",e.bottomEnd="bottom-end",e.leftStart="left-start",e.leftEnd="left-end",e.rightStart="right-start",e.rightEnd="right-end",e))($||{}),x=(e=>(e.before="before",e.after="after",e))(x||{}),E=(e=>(e.button="button",e.submit="submit",e.reset="reset",e))(E||{}),w=(e=>(e._blank="_blank",e._self="_self",e._parent="_parent",e._top="_top",e))(w||{});const D=Symbol.for("checkGroup");function q(e,n,r){return r?B(e,r)===B(n,r):P(e,n)}function P(e,n){if(e===n)return!0;if(e&&n&&typeof e=="object"&&typeof n=="object"){const r=Array.isArray(e),i=Array.isArray(n);let o,s,l;if(r&&i){if(s=e.length,s!=n.length)return!1;for(o=s;o--!==0;)if(!P(e[o],n[o]))return!1;return!0}if(r!=i)return!1;const y=e instanceof Date,a=n instanceof Date;if(y!=a)return!1;if(y&&a)return e.getTime()==n.getTime();const d=e instanceof RegExp,u=n instanceof RegExp;if(d!=u)return!1;if(d&&u)return e.toString()==n.toString();const c=Object.keys(e);if(s=c.length,s!==Object.keys(n).length)return!1;for(o=s;o--!==0;)if(!Object.prototype.hasOwnProperty.call(n,c[o]))return!1;for(o=s;o--!==0;)if(l=c[o],!P(e[l],n[l]))return!1;return!0}return e!==e&&n!==n}function B(e,n){if(e&&Object.keys(e).length&&n){if(n.indexOf(".")===-1)return e[n];{const r=n.split(".");let i=e;for(let o=0,s=r.length;o<s;++o){if(e==null)return null;i=i[r[o]]}return i}}else return null}function W(e,n){if(e!=null&&n&&n.length){for(const r of n)if(q(e,r))return!0}return!1}function H(e){return(n=>n==null||n===""||Array.isArray(n)&&n.length===0||!(n instanceof Date)&&typeof n=="object"&&Object.keys(n).length===0)(t.unref(e))}function Y(e){return typeof e=="string"||e instanceof String}function j(e){return Array.isArray(e)?e.filter(n=>Y(n)).join(" "):e}function K(e,n){const{invalid:r,valid:i,hint:o,loading:s}=n,{hintLabel:l,modelValue:y,valid:a,validLabel:d,invalid:u,invalidLabel:c,...h}=t.toRefs(e),p=B(h,"loading"),m=B(h,"loadingLabel"),v=t.computed(()=>u.value?!!(u.value&&r||c!=null&&c.value&&Array.isArray(c.value)&&c.value.length>0||c!=null&&c.value&&!H(c)):!1),f=t.computed(()=>!!(l&&l.value||o)),g=t.computed(()=>!!(d&&d.value||i)),_=t.computed(()=>!!(p!=null&&p.value&&s||p!=null&&p.value&&(m!=null&&m.value))),S=t.computed(()=>f.value||g.value||v.value||_.value);return{hasInvalid:v,hasHint:f,hasValid:g,hasLoading:_,HintSlot:{name:"HintSlot",props:{params:{type:Object,default:()=>({})}},setup(C){const G=t.computed(()=>{const k=O.toReactive({hintLabel:l,modelValue:y,valid:a,validLabel:d,invalid:u,invalidLabel:c,loading:p,loadingLabel:m,...C.params});return u!=null&&u.value?(r==null?void 0:r(k))||j(c==null?void 0:c.value)||(l==null?void 0:l.value):a!=null&&a.value?(i==null?void 0:i(k))||j(d==null?void 0:d.value)||(l==null?void 0:l.value):p!=null&&p.value?(s==null?void 0:s(k))||j(m==null?void 0:m.value)||(l==null?void 0:l.value):(o==null?void 0:o(k))||j(l==null?void 0:l.value)||(l==null?void 0:l.value)});return{isVisible:S,hasInvalid:v,hasValid:g,hintContent:G}},render(){if(this.isVisible)return t.h("small",{role:this.hasInvalid?"alert":this.hasValid?"status":void 0},this.hintContent)}}}}const Q={to:{type:[String,Object]},href:String,target:{type:String,validator:e=>Object.values(w).includes(e)},rel:{type:String,default:"noopener noreferrer"}},F={valid:Boolean,validLabel:[String,Array]},M={invalid:Boolean,invalidLabel:[String,Array]},R={disabled:Boolean},X={active:Boolean},Z={pressed:Boolean},I={label:[String,Number]},z={readonly:Boolean},N={modifiers:[String,Array]},T={hintLabel:{type:String,default:""}},L={options:{type:Array,default:()=>[]},labelKey:{type:[String,Function],default:"label"},valueKey:{type:[String,Function],default:"value"},disabledKey:{type:[String,Function],default:"disabled"}};x.before;const ee={tabindex:{type:[String,Number],default:0}},te={id:[String,Number]};A.bottom;const ne={...{...te,name:{type:String,required:!0}},...ee,...F,...M,...T,...R,...z,...N,...I,value:[String,Number,Boolean],modelValue:[Object,Number,Boolean,String]},re={...F,...M,...L,...T,...R,...z,...N,...I,modelValue:[String,Array],name:{type:String,required:!0},vertical:Boolean};({...R,...I,...Z,...X,...Q,type:E.button});function oe(e){const n=t.inject(e,void 0),r=t.computed(()=>!H(n));function i(o,s,l){if(n!=null&&n.value){const a=t.unref(n.value)[o];return t.computed({get(){return a==null?void 0:a.value},set(d){a.value=d}})}const y=t.toRef(s,o);return t.computed({get(){return y.value},set(a){l&&l(`update:${o}`,a)}})}return{group:n,isInGroup:r,getGroupOrLocalRef:i}}const ae={...ne,...N,indeterminate:Boolean,uncheckedValue:[String,Number,Boolean],switch:Boolean},le=["click","update:modelValue","change","blur"];function se(e,n){const{group:r,isInGroup:i,getGroupOrLocalRef:o}=oe(D),{id:s,switch:l,indeterminate:y}=t.toRefs(e),a=o("modelValue",e,n),d=o("readonly",e),u=o("disabled",e),c=o("valid",e),h=o("invalid",e);return{id:s,propsSwitch:l,indeterminate:y,group:r,isInGroup:i,modelValue:a,readonly:d,disabled:u,valid:c,invalid:h}}const ue=e=>t.computed(()=>String((e==null?void 0:e.value)||J.nanoid()));function U(e,n,r){return t.computed(()=>{const i={[e]:!0},o=typeof(n==null?void 0:n.value)=="string"?n.value.split(" "):n==null?void 0:n.value;return o&&Array.isArray(o)&&o.forEach(s=>{i[`${e}--${s}`]=!0}),r&&Object.keys(r.value).forEach(s=>{i[`${e}--${s}`]=t.unref(r.value[s])}),i})}const ie=["for"],ce=["id","name","disabled","value","tabindex","aria-invalid"],de={name:"VvCheckbox"},fe=t.defineComponent({...de,props:ae,emits:le,setup(e,{emit:n}){const r=e,i=t.useSlots(),{id:o,disabled:s,readonly:l,valid:y,invalid:a,propsSwitch:d,modelValue:u,indeterminate:c,isInGroup:h}=se(r,n),p=ue(o),m=t.computed(()=>g.value?-1:r.tabindex),v=t.ref(),f=t.computed(()=>r.uncheckedValue!==void 0&&!h.value),g=t.computed(()=>s.value||l.value),_=t.computed(()=>{if(a.value===!0)return!0;if(y.value===!0)return!1}),S=t.computed(()=>f.value?u.value===r.value:Array.isArray(u.value)?W(r.value,u.value):q(r.value,u.value)),C=t.computed(()=>!!(c.value||!S.value&&f.value&&r.uncheckedValue!==u.value)),G=t.computed(()=>{if(!f.value)return["string","number","boolean"].includes(typeof r.value)?r.value:!0}),k=t.computed({get(){return S.value},set(b){if(f.value)u.value=b?r.value:r.uncheckedValue;else if(Array.isArray(u.value)||h.value){const V=new Set(Array.isArray(u.value)?u.value:u.value!==void 0?[u.value]:[]);b?V.add(r.value):V.delete(r.value),u.value=[...V]}else u.value=b?r.value:void 0;n("change",b)}}),{modifiers:ke}=t.toRefs(r),Se=U("vv-checkbox",ke,t.computed(()=>({switch:d.value,valid:y.value,invalid:a.value,disabled:s.value,readonly:l.value,indeterminate:c.value})));t.watchEffect(()=>{f.value&&Array.isArray(u.value)&&console.warn("[VvCheckbox] The model value is an array but the component is in binary mode.")}),t.watch(()=>C.value,b=>{b?v.value.indeterminate=!0:v.value.indeterminate=!1}),t.onMounted(()=>{C.value&&(v.value.indeterminate=!0)});const{HintSlot:Oe}=K(r,i);return(b,V)=>(t.openBlock(),t.createElementBlock("label",{class:t.normalizeClass(t.unref(Se)),for:t.unref(p)},[t.withDirectives(t.createElementVNode("input",{id:t.unref(p),ref_key:"input",ref:v,"onUpdate:modelValue":V[0]||(V[0]=_e=>t.isRef(k)?k.value=_e:null),type:"checkbox",class:"vv-checkbox__input",name:b.name,disabled:t.unref(g),value:t.unref(G),tabindex:t.unref(m),"aria-invalid":t.unref(_)},null,8,ce),[[t.vModelCheckbox,t.unref(k)]]),t.renderSlot(b.$slots,"default",{value:t.unref(u)},()=>[t.createTextVNode(t.toDisplayString(b.label),1)]),t.createVNode(t.unref(Oe),{class:"vv-checkbox__hint",params:{value:t.unref(u)}},null,8,["params"])],10,ie))}}),pe=re,ye=["update:modelValue","change"];function me(e){if(Object.keys(e).some(n=>n!=="key"&&!t.isRef(e[n])))throw Error("One or more groupState props aren't ref.");t.provide(e.key,t.computed(()=>e))}function ve(e){const{options:n,labelKey:r,valueKey:i,disabledKey:o}=t.toRefs(e);return{options:n,getOptionLabel:a=>typeof a!="object"&&a!==null?a:typeof r.value=="function"?r.value(a):a[r.value],getOptionValue:a=>typeof a!="object"&&a!==null?a:typeof i.value=="function"?i.value(a):a[i.value],getOptionDisabled:a=>typeof a!="object"&&a!==null?!1:typeof o.value=="function"?o.value(a):a[o.value]}}const be=["textContent"],he={class:"vv-checkbox-group__wrapper"},ge={name:"VvCheckboxGroup"};return t.defineComponent({...ge,props:pe,emits:ye,setup(e,{emit:n}){const r=e,i=t.useSlots(),o=O.useVModel(r,"modelValue",n),{disabled:s,readonly:l,vertical:y,valid:a,invalid:d,modifiers:u}=t.toRefs(r);me({key:D,modelValue:o,disabled:s,readonly:l,valid:a,invalid:d});const{getOptionLabel:c,getOptionValue:h}=ve(r),p=U("vv-checkbox-group",u,t.computed(()=>({disabled:s.value,readonly:l.value,horizontal:!y.value,valid:a.value,invalid:d.value}))),m=(f,g)=>({id:`${r.name}_opt${g}`,name:r.name,label:c(f),value:h(f)}),{HintSlot:v}=K(r,i);return(f,g)=>(t.openBlock(),t.createElementBlock("fieldset",{class:t.normalizeClass(t.unref(p))},[f.label?(t.openBlock(),t.createElementBlock("legend",{key:0,textContent:t.toDisplayString(f.label)},null,8,be)):t.createCommentVNode("",!0),t.createElementVNode("div",he,[f.options.length>0?(t.openBlock(!0),t.createElementBlock(t.Fragment,{key:0},t.renderList(f.options,(_,S)=>(t.openBlock(),t.createBlock(fe,t.mergeProps({key:S},m(_,S)),null,16))),128)):t.renderSlot(f.$slots,"default",{key:1})]),t.createVNode(t.unref(v),{class:"vv-checkbox-group__hint"})],2))}})});

package/dist/components/VvCheckboxGroup/VvCheckboxGroup.vue.d.ts

@@ -1,12 +1,13 @@
 import type { Option } from '@/types/generic';
 declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     modelValue: (StringConstructor | ArrayConstructor)[];
-    label: StringConstructor;
     name: {
         type: StringConstructor;
         required: boolean;
     };
     vertical: BooleanConstructor;
+    label: (StringConstructor | NumberConstructor)[];
+    modifiers: import("vue").PropType<string | string[]>;
     readonly: BooleanConstructor;
     disabled: BooleanConstructor;
     hintLabel: {
@@ -25,18 +26,23 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         type: (StringConstructor | FunctionConstructor)[];
         default: string;
     };
+    disabledKey: {
+        type: (StringConstructor | FunctionConstructor)[];
+        default: string;
+    };
     invalid: BooleanConstructor;
     invalidLabel: (StringConstructor | ArrayConstructor)[];
     valid: BooleanConstructor;
     validLabel: (StringConstructor | ArrayConstructor)[];
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, string[], string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: (StringConstructor | ArrayConstructor)[];
-    label: StringConstructor;
     name: {
         type: StringConstructor;
         required: boolean;
     };
     vertical: BooleanConstructor;
+    label: (StringConstructor | NumberConstructor)[];
+    modifiers: import("vue").PropType<string | string[]>;
     readonly: BooleanConstructor;
     disabled: BooleanConstructor;
     hintLabel: {
@@ -55,6 +61,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         type: (StringConstructor | FunctionConstructor)[];
         default: string;
     };
+    disabledKey: {
+        type: (StringConstructor | FunctionConstructor)[];
+        default: string;
+    };
     invalid: BooleanConstructor;
     invalidLabel: (StringConstructor | ArrayConstructor)[];
     valid: BooleanConstructor;
@@ -63,14 +73,15 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
     [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
 }, {
     disabled: boolean;
+    options: (string | Option)[];
     readonly: boolean;
     hintLabel: string;
     invalid: boolean;
     valid: boolean;
     vertical: boolean;
-    options: (string | Option)[];
     labelKey: string | Function;
     valueKey: string | Function;
+    disabledKey: string | Function;
 }>, {
     default: (_: {}) => any;
 }>;

package/dist/components/VvCheckboxGroup/index.d.ts

@@ -1,11 +1,12 @@
 export declare const VvCheckboxGroupProps: {
     modelValue: (StringConstructor | ArrayConstructor)[];
-    label: StringConstructor;
     name: {
         type: StringConstructor;
         required: boolean;
     };
     vertical: BooleanConstructor;
+    label: (StringConstructor | NumberConstructor)[];
+    modifiers: import("vue").PropType<string | string[]>;
     readonly: BooleanConstructor;
     disabled: BooleanConstructor;
     hintLabel: {
@@ -24,6 +25,10 @@ export declare const VvCheckboxGroupProps: {
         type: (StringConstructor | FunctionConstructor)[];
         default: string;
     };
+    disabledKey: {
+        type: (StringConstructor | FunctionConstructor)[];
+        default: string;
+    };
     invalid: BooleanConstructor;
     invalidLabel: (StringConstructor | ArrayConstructor)[];
     valid: BooleanConstructor;