muba-posting 9.0.4 → 9.0.6

package/Publish2b.js

@@ -44,12 +44,16 @@ export default class Publish2b extends React.Component {
   }
 
   componentDidMount = async () => {
-    if (this.state.locationsList.length === 0) {
-      this.setState({
-        locationsList: await this.props.loadLocations()
-      });
+    let locationList = this.state.locationsList;
+    if (locationList.length === 0) {
+      locationList = await this.props.loadLocations();
     }
-    this.loadData();
+
+    this.setState({
+      locationsList: locationList
+    }, () => {
+      this.loadData();
+    });
   }
 
   loadData = async () => {
@@ -62,7 +66,7 @@ export default class Publish2b extends React.Component {
       }
     });
 
-    if (city != null) {
+    if (region != null) {
       this.setState({
         cityOptions: {
           elements: [this.state.cityOptions.elements[0], ...this.state.locationsList.filter(r => r.value === region)[0].subList.map(({ subList, ...rest }) => ({ ...rest }))],
@@ -71,7 +75,7 @@ export default class Publish2b extends React.Component {
       });
     }
 
-    if (district != null) {
+    if (city != null) {
       this.setState({
         districtOptions: {
           elements: [this.state.districtOptions.elements[0], ...this.state.locationsList.filter(r => r.value === region)[0].subList.filter(c => c.value === city)[0].subList.map(({ subList, ...rest }) => ({ ...rest }))],
@@ -80,7 +84,7 @@ export default class Publish2b extends React.Component {
       });
     }
 
-    if (town != null) {
+    if (district != null) {
       this.setState({
         townOptions: {
           elements: [this.state.townOptions.elements[0], ...this.state.locationsList.filter(r => r.value === region)[0].subList.filter(c => c.value === city)[0].subList.filter(d => d.value === district)[0].subList],
@@ -90,7 +94,7 @@ export default class Publish2b extends React.Component {
     }
   }
 
-  async loadRegions() {
+  loadRegions() {
     if (this.state.regionOptions.elements.length <= 1) {
       const regionOptions = {
         elements: [this.state.regionOptions.elements[0], ...this.state.locationsList.map(({ subList, ...rest }) => ({ ...rest }))],
@@ -101,7 +105,7 @@ export default class Publish2b extends React.Component {
     }
   }
 
-  async loadCities(value) {
+  loadCities(value) {
     this.setState({ regionOptions: { ...this.state.regionOptions, selectedItem: value } });
     this.props.postingAd.region = value;
 
@@ -124,7 +128,7 @@ export default class Publish2b extends React.Component {
     }
   }
 
-  async loadDistricts(value) {
+  loadDistricts(value) {
     this.setState({ cityOptions: { ...this.state.cityOptions, selectedItem: value } });
     this.props.postingAd.city = value;
 
@@ -139,20 +143,21 @@ export default class Publish2b extends React.Component {
         districtOptions.selectedItem = city.subList[0].value;
       }
 
-      this.setState({ districtOptions: districtOptions });
-      this.props.postingAd.district = null;
-      this.props.postingAd.town = null;
+      this.setState({ districtOptions: districtOptions }, async () => {
+        this.props.postingAd.district = null;
+        this.props.postingAd.town = null;
 
-      if (city.subList.length == 1) {
-        this.inputSelectDistrict?.onSubmitValidate();
-        await this.loadTowns(districtOptions.selectedItem);
-      } else {
-        this.setState({ townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null } });
-      }
+        if (city.subList.length == 1) {
+          this.inputSelectDistrict?.onSubmitValidate();
+          this.loadTowns(districtOptions.selectedItem);
+        } else {
+          this.setState({ townOptions: { elements: [this.state.townOptions.elements[0]], selectedItem: null } });
+        }
+      });
     }
   }
 
-  async loadTowns(value) {
+  loadTowns(value) {
     this.setState({ districtOptions: { ...this.state.districtOptions, selectedItem: value } })
     this.props.postingAd.district = value;
 
@@ -168,11 +173,11 @@ export default class Publish2b extends React.Component {
         this.props.postingAd.town = townOptions.selectedItem;
       }
 
-      this.setState({ townOptions: townOptions });
-
-      if (district.subList.length == 1) {
-        this.inputSelectTown?.onSubmitValidate();
-      }
+      this.setState({ townOptions: townOptions }, () => {
+        if (district.subList.length == 1) {
+          this.inputSelectTown?.onSubmitValidate();
+        }
+      });
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "9.0.4",
+  "version": "9.0.6",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {