@bpost/bp-address-auto-complete-by-component 1.1.25 → 1.1.26

package/fesm2020/bpost-bp-address-auto-complete-by-component.mjs

@@ -1755,7 +1755,7 @@ class StreetComponent {
     ngOnChanges(changes) {
         if (changes) {
             if (changes.hasOwnProperty('autofillData') && changes.autofillData.currentValue !== null && changes.autofillData.currentValue !== undefined) {
-                this.searchText = this.autofillData.streetName;
+                this.searchText = this.loadAutoFillParams(changes.autofillData.currentValue);
                 this.setSelectedAddress(this.autofillData.selectedAddress);
             }
             else {
@@ -1983,6 +1983,21 @@ class StreetComponent {
         }
         return concatStr;
     }
+    loadAutoFillParams(autoFillData) {
+        let concatStr = '';
+        if (autoFillData !== null) {
+            if (autoFillData.hasOwnProperty('postalCode') && this.isString(autoFillData.postalCode)) {
+                this.postalCode = autoFillData.postalCode;
+            }
+            if (autoFillData.hasOwnProperty('municipalityName') && this.isString(autoFillData.municipalityName)) {
+                this.locality = autoFillData.municipalityName;
+            }
+            if (autoFillData.hasOwnProperty('streetName') && this.isString(autoFillData.streetName)) {
+                concatStr = autoFillData.streetName;
+            }
+        }
+        return concatStr;
+    }
     isString(val) {
         if (val === null || val === undefined) {
             return false;
@@ -2613,8 +2628,7 @@ class StreetNumberComponent {
     ngOnChanges(changes) {
         if (changes) {
             if (changes.hasOwnProperty('autofillData') && changes.autofillData.currentValue !== null && changes.autofillData.currentValue !== undefined) {
-                this.searchText = this.autofillData.streetNumber;
-                this.addressIsComplete = this.autofillData.isCompleteStreetNumber;
+                this.searchText = this.loadAutoFillParams(changes.autofillData.currentValue);
                 this.setSelectedAddress(this.autofillData.selectedAddress);
             }
             else {
@@ -2835,6 +2849,28 @@ class StreetNumberComponent {
         }
         return concatStr;
     }
+    loadAutoFillParams(autoFillData) {
+        let concatStr = '';
+        if (autoFillData !== null) {
+            if (autoFillData.hasOwnProperty('postalCode') && this.isString(autoFillData.postalCode)) {
+                this.postalCode = autoFillData.postalCode;
+            }
+            if (autoFillData.hasOwnProperty('municipalityName') && this.isString(autoFillData.municipalityName)) {
+                this.locality = autoFillData.municipalityName;
+            }
+            if (autoFillData.hasOwnProperty('streetName') && this.isString(autoFillData.streetName)) {
+                this.streetName = autoFillData.streetName;
+            }
+            if (autoFillData.hasOwnProperty('streetNumber')
+                && this.isString(autoFillData.streetNumber)) {
+                concatStr = autoFillData.streetNumber;
+            }
+            if (autoFillData.hasOwnProperty('isCompleteStreetNumber')) {
+                this.addressIsComplete = this.autofillData.isCompleteStreetNumber;
+            }
+        }
+        return concatStr;
+    }
     isString(val) {
         if (val === null || val === undefined) {
             return false;
@@ -3447,7 +3483,7 @@ class StreetNumberComponent {
         return this.searchText && this.searchText.length > 0;
     }
     onClearStreetNumberInput(focus, emit = true) {
-        console.warn('street number :: clearInput');
+        // console.warn('street number :: clearInput');
         this.clearWidget();
         this.resetArrowSelectedIndex();
         this.previousIndex = -1;
@@ -3689,8 +3725,7 @@ class BoxNumberComponent {
     ngOnChanges(changes) {
         if (changes) {
             if (changes.hasOwnProperty('autofillData') && changes.autofillData.currentValue !== null && changes.autofillData.currentValue !== undefined) {
-                this.searchText = this.autofillData.boxNumber;
-                this.addressIsValidated = this.autofillData.isCompleteBoxNumber;
+                this.searchText = this.loadAutoFillParams(changes.autofillData.currentValue);
                 this.setSelectedAddress(this.autofillData.selectedAddress);
             }
             else {
@@ -3887,6 +3922,32 @@ class BoxNumberComponent {
         }
         return concatStr;
     }
+    loadAutoFillParams(autoFillData) {
+        let concatStr = '';
+        if (autoFillData !== null) {
+            if (autoFillData.hasOwnProperty('postalCode') && this.isString(autoFillData.postalCode)) {
+                this.postalCode = autoFillData.postalCode;
+            }
+            if (autoFillData.hasOwnProperty('municipalityName') && this.isString(autoFillData.municipalityName)) {
+                this.locality = autoFillData.municipalityName;
+            }
+            if (autoFillData.hasOwnProperty('streetName') && this.isString(autoFillData.streetName)) {
+                this.streetName = autoFillData.streetName;
+            }
+            if (autoFillData.hasOwnProperty('streetNumber')
+                && this.isString(autoFillData.streetNumber)) {
+                this.streetNumber = autoFillData.streetNumber;
+            }
+            if (autoFillData.hasOwnProperty('boxNumber')
+                && this.isString(autoFillData.boxNumber)) {
+                concatStr = autoFillData.boxNumber;
+            }
+            if (autoFillData.hasOwnProperty('isCompleteBoxNumber')) {
+                this.addressIsValidated = this.autofillData.isCompleteBoxNumber;
+            }
+        }
+        return concatStr;
+    }
     isString(val) {
         if (val === null || val === undefined) {
             return false;
@@ -4789,6 +4850,7 @@ class LibAddressAutocompleteByComponentComponent {
                     console.log('lib::widget detected prefilling', this.addressParams);
                 }
                 this.addressParams.minLevel = /*4*/ ADDRESSLEVEL.LOCALITY;
+                this.minLevel = this.addressParams.minLevel;
                 // this.localityPrefillData = this.addressParams; // as any as PrefillData;
                 this.localityPrefillData = new PrefillData(this.addressParams);
                 // Object.assign(this.localityPrefillData, this.addressParams);
@@ -5038,7 +5100,7 @@ class LibAddressAutocompleteByComponentComponent {
         if (this.showDebugMessageToConsole) {
             console.log('notifyAddressComplete', this.selectedAddress, 'nis9InResponse:' + this.nis9InResponse, typeof this.nis9InResponse);
         }
-        if (this.selectedAddress && !this.autocompleteLocality.prefilling) {
+        if (this.selectedAddress) {
             let isCompleteStreetNumber = false;
             let isCompleteBoxNumber = false;
             if (this.selectedAddress.hasOwnProperty('isComplete') && this.selectedAddress.isComplete) {
@@ -5110,6 +5172,7 @@ class LibAddressAutocompleteByComponentComponent {
                 this.autocompleteBoxNb.searchText = '';
                 this.autocompleteBoxNb.streetNumber = '';
                 this.autocompleteBoxNb.clearInput(false, false);
+                this.boxNumberAutofillData = null;
             }
             // Street number
             this.streetNumber = '';
@@ -5120,6 +5183,7 @@ class LibAddressAutocompleteByComponentComponent {
                 this.autocompleteStreetNb.searchText = '';
                 this.autocompleteStreetNb.streetName = '';
                 this.autocompleteStreetNb.onClearStreetNumberInput(false, false);
+                this.streetNumberAutofillData = null;
             }
             // Street name
             this.street = '';
@@ -5129,12 +5193,14 @@ class LibAddressAutocompleteByComponentComponent {
                 }
                 this.autocompleteStreet.searchText = '';
                 this.autocompleteStreet.clearInput(false, false);
+                this.streetNameAutofillData = null;
             }
             // Locality
             this.locality = '';
             if (this.autocompleteLocality) {
                 this.autocompleteLocality.searchText = '';
                 this.autocompleteLocality.clearInput(false, false);
+                this.autofillData = null;
             }
             nextAddress = null;
         }
@@ -5145,6 +5211,7 @@ class LibAddressAutocompleteByComponentComponent {
                 this.autocompleteBoxNb.searchText = '';
                 this.autocompleteBoxNb.streetNumber = '';
                 this.autocompleteBoxNb.clearInput(false, false);
+                this.boxNumberAutofillData = null;
             }
             // Street number
             this.streetNumber = '';
@@ -5152,12 +5219,14 @@ class LibAddressAutocompleteByComponentComponent {
                 this.autocompleteStreetNb.searchText = '';
                 this.autocompleteStreetNb.streetName = '';
                 this.autocompleteStreetNb.onClearStreetNumberInput(false, false);
+                this.streetNumberAutofillData = null;
             }
             // Street name
             this.street = '';
             if (this.autocompleteStreet) {
                 this.autocompleteStreet.searchText = '';
                 this.autocompleteStreet.clearInput(false, false);
+                this.streetNameAutofillData = null;
             }
             nextAddress = null;
         }
@@ -5168,6 +5237,7 @@ class LibAddressAutocompleteByComponentComponent {
                 this.autocompleteBoxNb.searchText = '';
                 this.autocompleteBoxNb.streetNumber = '';
                 this.autocompleteBoxNb.clearInput(false, false);
+                this.boxNumberAutofillData = null;
             }
             // Street number
             this.streetNumber = '';
@@ -5175,6 +5245,7 @@ class LibAddressAutocompleteByComponentComponent {
                 this.autocompleteStreetNb.searchText = '';
                 // this.autocompleteStreetNb.streetName = '';
                 this.autocompleteStreetNb.onClearStreetNumberInput(false, false);
+                this.streetNumberAutofillData = null;
             }
             nextAddress = null;
         }
@@ -5186,6 +5257,7 @@ class LibAddressAutocompleteByComponentComponent {
                 // this.autocompleteBoxNb.streetNumber = '';
                 this.autocompleteBoxNb.clearInput(false, false);
             }
+            this.boxNumberAutofillData = null;
             // Attention: if not-in-list don't reset the address, just modify it
             const addressIsNotInList = nextAddress !== undefined && nextAddress !== null
                 && nextAddress.hasOwnProperty('not-in-list') && nextAddress['not-in-list'] === true
@@ -5426,6 +5498,10 @@ class LibAddressAutocompleteByComponentComponent {
             this.autocompleteStreet.locality = '';
             this.autocompleteStreetNb.streetName = '';
             this.autocompleteBoxNb.streetNumber = '';
+            this.autofillData = null;
+            this.streetNameAutofillData = null;
+            this.streetNumberAutofillData = null;
+            this.boxNumberAutofillData = null;
         }
     }
     quitPrefillMode() {
@@ -5580,6 +5656,27 @@ class LibAddressAutocompleteByComponentComponent {
             this.selectedAddress.isCompleteNotificationDone = true;
             this.notifyAddressComplete();
         }
+        if (address && level) {
+            setTimeout(() => {
+                switch (level) {
+                    case 4: // Locality filled -> focus street
+                        if (address.streetName && this.autocompleteStreet && this.autocompleteStreet.streetSearchInput) {
+                            this.autocompleteStreet.streetSearchInput.nativeElement.focus();
+                        }
+                        break;
+                    case 3: // Street filled -> focus street number
+                        if (address.houseNumber && this.autocompleteStreetNb && this.autocompleteStreetNb.streetNumberSearchInput) {
+                            this.autocompleteStreetNb.streetNumberSearchInput.nativeElement.focus();
+                        }
+                        break;
+                    case 2: // Street number filled -> focus box number
+                        if ((address.boxNumber || this.streetNumberAutofillData) && this.autocompleteBoxNb && this.autocompleteBoxNb.boxNumberSearchInput) {
+                            this.autocompleteBoxNb.boxNumberSearchInput.nativeElement.focus();
+                        }
+                        break;
+                }
+            }, 0);
+        }
     }
     setAddressStreetNumber(streetNumber) {
         if (this.showDebugMessageToConsole) {
@@ -5676,6 +5773,9 @@ class LibAddressAutocompleteByComponentComponent {
           this.streetParams = this.addressParams;
         }
         */
+        this.streetNameAutofillData = null;
+        this.streetNumberAutofillData = null;
+        this.boxNumberAutofillData = null;
         const data = event.prefillData;
         if (event.prefillData.prefillMunicipalityPerfectMatchFound === true) {
             const suggestion = data.prefillMunicipalityPerfectMatchSuggestion;
@@ -5714,7 +5814,19 @@ class LibAddressAutocompleteByComponentComponent {
               this.streetPrefillData = this.prefillData;
             }
             */
-            this.streetPrefillData = this.prefillData;
+            if (address.streetName) {
+                this.setAddress(address, ADDRESSLEVEL.LOCALITY);
+                this.minLevel = ADDRESSLEVEL.STREET;
+                const streetNumber = this.prefillData.parameters.streetNumber;
+                const boxNumber = this.prefillData.parameters.boxNumber;
+                if (boxNumber && !address.boxNumber) {
+                    this.prefillData.parameters.minLevel = ADDRESSLEVEL.BOX_NUMBER;
+                    this.boxNumberPrefillData = this.prefillData;
+                }
+            }
+            else {
+                this.streetPrefillData = this.prefillData;
+            }
         }
         else {
             // const cpAndLocality = this.prefillData.parameters.postalCode + this.prefillData.parameters.municipalityName;
@@ -5749,7 +5861,7 @@ class LibAddressAutocompleteByComponentComponent {
             this.addressParams.minLevel = ADDRESSLEVEL.STREET_NUMBER;
             // this.localityPrefillData = this.addressParams; // as any as PrefillData;
             // this.localityPrefillData = new PrefillData(this.addressParams);
-            // Object.assign(this.localityPrefillData, this.addressParams);
+            // Object.assign(this.localityPrefillData, this.addressParams);      
             this.prefillData = event.prefillData;
             this.prefillData.ts = new Date();
             this.prefillData.parameters.minLevel = ADDRESSLEVEL.STREET_NUMBER;
@@ -5797,7 +5909,13 @@ class LibAddressAutocompleteByComponentComponent {
             if (this.showDebugMessageToConsole) {
                 console.warn('lib::street: prefill - transmitting prefill data for streetNumber :', this.prefillData);
             }
-            this.streetNumberPrefillData = this.prefillData;
+            if (address.houseNumber) {
+                this.setAddress(address, ADDRESSLEVEL.STREET);
+                this.minLevel = ADDRESSLEVEL.STREET_NUMBER;
+            }
+            else {
+                this.streetNumberPrefillData = this.prefillData;
+            }
         }
         else {
             const prefillStreetName = this.prefillData.parameters.streetName;
@@ -5928,7 +6046,7 @@ class LibAddressAutocompleteByComponentComponent {
             const address = suggestion.address;
             this.updateStreetNumber(address);
             this.autocompleteStreetNb.selectedAddress = address;
-            const addressIsComplete = address && address.hasOwnProperty('isComplete') && address.isComplete === true ? true : false;
+            const addressIsComplete = address && address.hasOwnProperty('isComplete') && !address.hasOwnProperty('boxNumber') && address.isComplete === true ? true : false;
             const addressIsNotInList = address && address.hasOwnProperty('not-in-list') && address['not-in-list'] === true ? true : false;
             if (addressIsComplete && !addressIsNotInList) {
                 // found address - perfect matchat street number level