Skip to content

Commit

Permalink
[#136] Update dist & version to v2.4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@ifirmawan
ifirmawan committed Apr 23, 2024
1 parent 16ab37c commit c1a339b
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 73 deletions.
71 changes: 36 additions & 35 deletions dist/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37814,7 +37814,7 @@ var fnToArray = function fnToArray(fnString) {
/\#\d+|#([^#\n]+)#|[(),?;&.'":()+\-*/.]|<=|<|>|>=|!=|==|[||]{2}|=>|\w+| /g;
return fnString.match(regex);
};
var generateFnBody = function generateFnBody(fnMetadata, values, questions) {
var generateFnBody = function generateFnBody(fnMetadata, getFieldValue, questions) {
if (!fnMetadata) {
return false;
}
Expand All @@ -37831,7 +37831,7 @@ var generateFnBody = function generateFnBody(fnMetadata, values, questions) {
var metaValue = meta ? meta[1] : (_questions$find = questions.find(function (q) {
return (q === null || q === void 0 ? void 0 : q.name) === metaVar[0].slice(1, -1);
})) === null || _questions$find === void 0 ? void 0 : _questions$find.id;
var val = values === null || values === void 0 ? void 0 : values[metaValue];
var val = getFieldValue("" + metaValue);
if (val === 9999 || val === 9998) {
return null;
}
Expand Down Expand Up @@ -37892,19 +37892,19 @@ var fixIncompleteMathOperation = function fixIncompleteMathOperation(expression)
}
return expression;
};
var strToFunction = function strToFunction(fnString, values, questions) {
var strToFunction = function strToFunction(fnString, getFieldValue, questions) {
fnString = checkDirty(fnString);
var fnMetadata = getFnMetadata(fnString);
var fnBody = fixIncompleteMathOperation(generateFnBody(fnMetadata, values, questions));
var fnBody = fixIncompleteMathOperation(generateFnBody(fnMetadata, getFieldValue, questions));
try {
return new Function(fnBody);
} catch (error) {
return false;
}
};
var strMultilineToFunction = function strMultilineToFunction(fnString, values, questions) {
var strMultilineToFunction = function strMultilineToFunction(fnString, getFieldValue, questions) {
fnString = checkDirty(fnString);
var fnBody = generateFnBody(fnString, values, questions);
var fnBody = generateFnBody(fnString, getFieldValue, questions);
try {
return new Function(fnBody);
} catch (error) {
Expand Down Expand Up @@ -37934,36 +37934,37 @@ var TypeAutoField = function TypeAutoField(_ref) {
var allQuestions = GlobalStore.useState(function (gs) {
return gs.allQuestions;
});
var currentValue = getFieldValue(id === null || id === void 0 ? void 0 : id.toString());
React.useEffect(function () {
var unsubscribeValues = GlobalStore.subscribe(function (s) {
try {
var automateValue = fn !== null && fn !== void 0 && fn.multiline && allQuestions.length ? strMultilineToFunction(fn === null || fn === void 0 ? void 0 : fn.fnString, s.current, allQuestions) : strToFunction(fn === null || fn === void 0 ? void 0 : fn.fnString, s.current, allQuestions);
if (typeof automateValue !== 'function') {
return Promise.resolve();
}
var _temp3 = _catch(function () {
function _temp(answer) {
if (typeof answer !== 'undefined' && answer !== currentValue) {
var _setFieldsValue;
setFieldsValue((_setFieldsValue = {}, _setFieldsValue[id] = answer, _setFieldsValue));
}
var automateValue = null;
if (fn !== null && fn !== void 0 && fn.multiline && allQuestions.length) {
automateValue = strMultilineToFunction(fn === null || fn === void 0 ? void 0 : fn.fnString, getFieldValue, allQuestions);
}
if (!(fn !== null && fn !== void 0 && fn.multiline) && allQuestions.length) {
automateValue = strToFunction(fn === null || fn === void 0 ? void 0 : fn.fnString, getFieldValue, allQuestions);
}
var handleAutomateValue = React.useCallback(function () {
try {
var _temp3 = _catch(function () {
function _temp(answer) {
var currentValue = getFieldValue("" + id);
if (typeof answer !== 'undefined' && answer !== currentValue) {
var _setFieldsValue;
setFieldsValue((_setFieldsValue = {}, _setFieldsValue[id] = answer, _setFieldsValue));
}
var _checkIsPromise = checkIsPromise(automateValue());
return _checkIsPromise ? Promise.resolve(automateValue()).then(_temp) : _temp(automateValue());
}, function () {
var _setFieldsValue2;
setFieldsValue((_setFieldsValue2 = {}, _setFieldsValue2[id] = null, _setFieldsValue2));
});
return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
} catch (e) {
return Promise.reject(e);
}
});
return function () {
unsubscribeValues();
};
}, [allQuestions, currentValue, fn === null || fn === void 0 ? void 0 : fn.fnString, fn === null || fn === void 0 ? void 0 : fn.multiline, id, setFieldsValue]);
}
var _checkIsPromise = checkIsPromise(automateValue());
return _checkIsPromise ? Promise.resolve(automateValue()).then(_temp) : _temp(automateValue());
}, function () {
var _setFieldsValue2;
setFieldsValue((_setFieldsValue2 = {}, _setFieldsValue2[id] = null, _setFieldsValue2));
});
return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
} catch (e) {
return Promise.reject(e);
}
}, [automateValue, id, setFieldsValue, getFieldValue]);
React.useEffect(function () {
handleAutomateValue();
}, [handleAutomateValue]);
var extraBefore = extra ? extra.filter(function (ex) {
return ex.placement === 'before';
}) : [];
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map
View file

Large diffs are not rendered by default.

71 changes: 36 additions & 35 deletions dist/index.modern.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37811,7 +37811,7 @@ var fnToArray = function fnToArray(fnString) {
/\#\d+|#([^#\n]+)#|[(),?;&.'":()+\-*/.]|<=|<|>|>=|!=|==|[||]{2}|=>|\w+| /g;
return fnString.match(regex);
};
var generateFnBody = function generateFnBody(fnMetadata, values, questions) {
var generateFnBody = function generateFnBody(fnMetadata, getFieldValue, questions) {
if (!fnMetadata) {
return false;
}
Expand All @@ -37828,7 +37828,7 @@ var generateFnBody = function generateFnBody(fnMetadata, values, questions) {
var metaValue = meta ? meta[1] : (_questions$find = questions.find(function (q) {
return (q === null || q === void 0 ? void 0 : q.name) === metaVar[0].slice(1, -1);
})) === null || _questions$find === void 0 ? void 0 : _questions$find.id;
var val = values === null || values === void 0 ? void 0 : values[metaValue];
var val = getFieldValue("" + metaValue);
if (val === 9999 || val === 9998) {
return null;
}
Expand Down Expand Up @@ -37889,19 +37889,19 @@ var fixIncompleteMathOperation = function fixIncompleteMathOperation(expression)
}
return expression;
};
var strToFunction = function strToFunction(fnString, values, questions) {
var strToFunction = function strToFunction(fnString, getFieldValue, questions) {
fnString = checkDirty(fnString);
var fnMetadata = getFnMetadata(fnString);
var fnBody = fixIncompleteMathOperation(generateFnBody(fnMetadata, values, questions));
var fnBody = fixIncompleteMathOperation(generateFnBody(fnMetadata, getFieldValue, questions));
try {
return new Function(fnBody);
} catch (error) {
return false;
}
};
var strMultilineToFunction = function strMultilineToFunction(fnString, values, questions) {
var strMultilineToFunction = function strMultilineToFunction(fnString, getFieldValue, questions) {
fnString = checkDirty(fnString);
var fnBody = generateFnBody(fnString, values, questions);
var fnBody = generateFnBody(fnString, getFieldValue, questions);
try {
return new Function(fnBody);
} catch (error) {
Expand Down Expand Up @@ -37931,36 +37931,37 @@ var TypeAutoField = function TypeAutoField(_ref) {
var allQuestions = GlobalStore.useState(function (gs) {
return gs.allQuestions;
});
var currentValue = getFieldValue(id === null || id === void 0 ? void 0 : id.toString());
useEffect(function () {
var unsubscribeValues = GlobalStore.subscribe(function (s) {
try {
var automateValue = fn !== null && fn !== void 0 && fn.multiline && allQuestions.length ? strMultilineToFunction(fn === null || fn === void 0 ? void 0 : fn.fnString, s.current, allQuestions) : strToFunction(fn === null || fn === void 0 ? void 0 : fn.fnString, s.current, allQuestions);
if (typeof automateValue !== 'function') {
return Promise.resolve();
}
var _temp3 = _catch(function () {
function _temp(answer) {
if (typeof answer !== 'undefined' && answer !== currentValue) {
var _setFieldsValue;
setFieldsValue((_setFieldsValue = {}, _setFieldsValue[id] = answer, _setFieldsValue));
}
var automateValue = null;
if (fn !== null && fn !== void 0 && fn.multiline && allQuestions.length) {
automateValue = strMultilineToFunction(fn === null || fn === void 0 ? void 0 : fn.fnString, getFieldValue, allQuestions);
}
if (!(fn !== null && fn !== void 0 && fn.multiline) && allQuestions.length) {
automateValue = strToFunction(fn === null || fn === void 0 ? void 0 : fn.fnString, getFieldValue, allQuestions);
}
var handleAutomateValue = useCallback(function () {
try {
var _temp3 = _catch(function () {
function _temp(answer) {
var currentValue = getFieldValue("" + id);
if (typeof answer !== 'undefined' && answer !== currentValue) {
var _setFieldsValue;
setFieldsValue((_setFieldsValue = {}, _setFieldsValue[id] = answer, _setFieldsValue));
}
var _checkIsPromise = checkIsPromise(automateValue());
return _checkIsPromise ? Promise.resolve(automateValue()).then(_temp) : _temp(automateValue());
}, function () {
var _setFieldsValue2;
setFieldsValue((_setFieldsValue2 = {}, _setFieldsValue2[id] = null, _setFieldsValue2));
});
return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
} catch (e) {
return Promise.reject(e);
}
});
return function () {
unsubscribeValues();
};
}, [allQuestions, currentValue, fn === null || fn === void 0 ? void 0 : fn.fnString, fn === null || fn === void 0 ? void 0 : fn.multiline, id, setFieldsValue]);
}
var _checkIsPromise = checkIsPromise(automateValue());
return _checkIsPromise ? Promise.resolve(automateValue()).then(_temp) : _temp(automateValue());
}, function () {
var _setFieldsValue2;
setFieldsValue((_setFieldsValue2 = {}, _setFieldsValue2[id] = null, _setFieldsValue2));
});
return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
} catch (e) {
return Promise.reject(e);
}
}, [automateValue, id, setFieldsValue, getFieldValue]);
useEffect(function () {
handleAutomateValue();
}, [handleAutomateValue]);
var extraBefore = extra ? extra.filter(function (ex) {
return ex.placement === 'before';
}) : [];
Expand Down
2 changes: 1 addition & 1 deletion dist/index.modern.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "akvo-react-form",
"version": "2.4.7",
"version": "2.4.8",
"description": "Simple react component for building webforms",
"license": "AGPL-3.0",
"repository": "akvo/akvo-react-form",
Expand Down

0 comments on commit c1a339b

Please sign in to comment.