@datarailsshared/datarailsshared 1.4.304 → 1.4.305

package/bundles/datarailsshared-datarailsshared.umd.js

@@ -445,11 +445,15 @@
             this.updateLockedDate();
             this.chosenTagHandler();
         };
+        ForecastTagComponent.prototype.isNeedToIncrementYear = function (dateObj, fiscalYearStartsFrom) {
+            return dateObj.month() + 1 >= fiscalYearStartsFrom;
+        };
         ForecastTagComponent.prototype.initDate = function () {
             var dateVal = this.defaultValue ? moment$8.unix(this.defaultValue) : moment$8();
             var fiscal_year_starts_from = this.fiscalYearStartsFrom || 1;
             var fiscal_year_back = this.fiscalYearBack || false;
             this.forecastValue = this.getFiscalMonthFromDate(dateVal, fiscal_year_starts_from) - 1;
+            this.initialForecastValue = this.forecastValue;
             var fiscal_year = this.getFiscalYearFromDate(dateVal, fiscal_year_starts_from, fiscal_year_back);
             this.updateYear(fiscal_year, this.forecastValue);
             this.updateLockedDate();
@@ -491,15 +495,18 @@
             return all_months.indexOf(dateObj.month() + 1) + 1;
         };
         ForecastTagComponent.prototype.getFiscalYearFromDate = function (dateObj, fiscal_year_starts_from, fiscal_year_back) {
+            var _a;
             var fiscal_year = dateObj.year();
-            if (!fiscal_year_back) {
-                if (dateObj.month() + 1 >= fiscal_year_starts_from && fiscal_year_starts_from !== 1) {
-                    fiscal_year += 1;
+            if (this.initialForecastValue !== this.forecastValue && !!((_a = this.dateObj) === null || _a === void 0 ? void 0 : _a.date) && dateObj.year() - moment$8.unix(this.defaultValue).year() < 1 && fiscal_year_starts_from !== 1) {
+                if (!fiscal_year_back) {
+                    if (this.isNeedToIncrementYear(dateObj, fiscal_year_starts_from)) {
+                        fiscal_year += 1;
+                    }
                 }
-            }
-            else {
-                if (dateObj.month() + 1 < fiscal_year_starts_from && fiscal_year_starts_from !== 1) {
-                    fiscal_year -= 1;
+                else {
+                    if (!this.isNeedToIncrementYear(dateObj, fiscal_year_starts_from)) {
+                        fiscal_year -= 1;
+                    }
                 }
             }
             return fiscal_year;