Skip to content

Commit eab2c74

Browse files
author
Sergei Aksiutin
committed
[NEP-12629] Fix filters default value.
1 parent df27902 commit eab2c74

File tree

4 files changed

+32
-21
lines changed

4 files changed

+32
-21
lines changed

dist/react-filterbar.js

+12-6
Original file line numberDiff line numberDiff line change
@@ -22077,6 +22077,12 @@ var _SearchClient = require("../clients/SearchClient");
2207722077

2207822078
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
2207922079

22080+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
22081+
22082+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
22083+
22084+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
22085+
2208022086
function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
2208122087

2208222088
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -22105,7 +22111,7 @@ var FilterBarStore = /*#__PURE__*/function () {
2210522111
this.exportResultsUrl = configuration.exportResultsUrl;
2210622112
this.exportPageLimit = configuration.exportPageLimit;
2210722113
this.exportPageLimitExceededMessage = configuration.exportPageLimitExceededMessage;
22108-
this.filters = configuration.filters;
22114+
this.filters = configuration.filters || {};
2210922115
this.activeFilters = configuration.activeFilters || [];
2211022116
this.quickFilters = configuration.quickFilters || {};
2211122117

@@ -22480,13 +22486,13 @@ var FilterBarStore = /*#__PURE__*/function () {
2248022486
}, {
2248122487
key: "addGroupFilter",
2248222488
value: function addGroupFilter(filterUid, groupKey, value) {
22483-
var filter = this.filters[filterUid];
22489+
var filterTemplate = this.filters[filterUid];
22490+
22491+
var filter = _objectSpread({}, filterTemplate);
22492+
2248422493
filter.filterUid = filterUid;
2248522494
filter.uid = filterUid;
22486-
22487-
if (value) {
22488-
filter.value = value;
22489-
}
22495+
filter.value = value;
2249022496

2249122497
if (groupKey == undefined) {
2249222498
this.activeFilters.push([filter]);

dist/react-filterbar.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/public/js/react-filterbar.js

+13-7
Large diffs are not rendered by default.

src/stores/FilterBarStore.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export class FilterBarStore {
1616
this.exportResultsUrl = configuration.exportResultsUrl;
1717
this.exportPageLimit = configuration.exportPageLimit;
1818
this.exportPageLimitExceededMessage = configuration.exportPageLimitExceededMessage;
19-
this.filters = configuration.filters;
19+
this.filters = configuration.filters || {};
2020
this.activeFilters = configuration.activeFilters || [];
2121
this.quickFilters = configuration.quickFilters || {};
2222

@@ -212,13 +212,12 @@ export class FilterBarStore {
212212
}
213213

214214
addGroupFilter(filterUid, groupKey, value) {
215-
const filter = this.filters[filterUid];
215+
const filterTemplate = this.filters[filterUid];
216+
const filter = { ...filterTemplate };
217+
216218
filter.filterUid = filterUid;
217219
filter.uid = filterUid;
218-
219-
if (value) {
220-
filter.value = value
221-
}
220+
filter.value = value;
222221

223222
if (groupKey == undefined) {
224223
this.activeFilters.push([filter])

0 commit comments

Comments
 (0)