@pingux/astro 1.7.0-alpha.11 → 1.7.0-alpha.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/cjs/components/ComboBoxField/ComboBoxField.js +1 -1
  2. package/lib/cjs/components/ComboBoxField/ComboBoxField.test.js +8 -4
  3. package/lib/cjs/components/TimeZonePicker/TimeZonePicker.js +21 -10
  4. package/lib/components/ComboBoxField/ComboBoxField.js +1 -1
  5. package/lib/components/ComboBoxField/ComboBoxField.test.js +8 -4
  6. package/lib/components/TimeZonePicker/TimeZonePicker.js +21 -10
  7. package/package.json +1 -1
package/lib/cjs/components/ComboBoxField/ComboBoxField.js CHANGED
@@ -417,7 +417,7 @@ ComboBoxField.propTypes = {
417
417
  })
418
418
  };
419
419
  ComboBoxField.defaultProps = {
420
- menuTrigger: 'input',
420
+ menuTrigger: 'focus',
421
421
  direction: 'bottom',
422
422
  scrollBoxProps: {
423
423
  maxHeight: '300px'
package/lib/cjs/components/ComboBoxField/ComboBoxField.test.js CHANGED
@@ -315,7 +315,8 @@ test('should invoke onInputChange', function () {
315
315
  test('should invoke onOpenChange on button click', function () {
316
316
  var onOpenChange = jest.fn();
317
317
  getComponent({
318
- onOpenChange: onOpenChange
318
+ onOpenChange: onOpenChange,
319
+ menuTrigger: 'manual'
319
320
  });
320
321
 
321
322
  var button = _testWrapper.screen.queryByRole('button');
@@ -332,7 +333,8 @@ test('should invoke onOpenChange on button click', function () {
332
333
  test('should invoke onOpenChange on input change', function () {
333
334
  var onOpenChange = jest.fn();
334
335
  getComponent({
335
- onOpenChange: onOpenChange
336
+ onOpenChange: onOpenChange,
337
+ menuTrigger: 'input'
336
338
  });
337
339
 
338
340
  var input = _testWrapper.screen.queryByRole('combobox');
@@ -349,7 +351,8 @@ test('should invoke onOpenChange on input change', function () {
349
351
  test('should invoke onOpenChange on keyboard arrow down', function () {
350
352
  var onOpenChange = jest.fn();
351
353
  getComponent({
352
- onOpenChange: onOpenChange
354
+ onOpenChange: onOpenChange,
355
+ menuTrigger: 'manual'
353
356
  });
354
357
 
355
358
  var input = _testWrapper.screen.queryByRole('combobox');
@@ -366,7 +369,8 @@ test('should invoke onOpenChange on keyboard arrow down', function () {
366
369
  test('should invoke onOpenChange on keyboard arrow up', function () {
367
370
  var onOpenChange = jest.fn();
368
371
  getComponent({
369
- onOpenChange: onOpenChange
372
+ onOpenChange: onOpenChange,
373
+ menuTrigger: 'manual'
370
374
  });
371
375
 
372
376
  var input = _testWrapper.screen.queryByRole('combobox');
package/lib/cjs/components/TimeZonePicker/TimeZonePicker.js CHANGED
@@ -187,16 +187,16 @@ var TimeZonePicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
187
187
  return aNum - bNum;
188
188
  };
189
189
 
190
- var items = (0, _react.useMemo)(function () {
191
- var _context7;
190
+ var checkIsSelectedItem = function checkIsSelectedItem() {
191
+ return (0, _filter["default"])(timeZones).call(timeZones, function (tz) {
192
+ return tz.timeZone === search;
193
+ }).length > 0;
194
+ };
192
195
 
193
- if (filteredTimezones.length === 0) {
194
- return (0, _react2.jsx)(_index.Item, {
195
- key: emptySearchText
196
- }, emptySearchText);
197
- }
196
+ var renderTimeZones = function renderTimeZones(timeZonesToRender) {
197
+ var _context7;
198
198
 
199
- return (0, _map["default"])(_context7 = (0, _sort["default"])(filteredTimezones).call(filteredTimezones, sortByGMT)).call(_context7, function (_ref4) {
199
+ return (0, _map["default"])(_context7 = (0, _sort["default"])(timeZonesToRender).call(timeZonesToRender, sortByGMT)).call(_context7, function (_ref4) {
200
200
  var gmt = _ref4.gmt,
201
201
  time = _ref4.time,
202
202
  timeZone = _ref4.timeZone;
@@ -218,7 +218,17 @@ var TimeZonePicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
218
218
  variant: "timeZone.time"
219
219
  }, time))));
220
220
  });
221
- }, [emptySearchText, filteredTimezones]);
221
+ };
222
+
223
+ var items = (0, _react.useMemo)(function () {
224
+ if (filteredTimezones.length === 0) {
225
+ return (0, _react2.jsx)(_index.Item, {
226
+ key: emptySearchText
227
+ }, emptySearchText);
228
+ }
229
+
230
+ return renderTimeZones(checkIsSelectedItem() ? timeZones : filteredTimezones);
231
+ }, [emptySearchText, filteredTimezones, search, timeZones]);
222
232
  var comboBoxFieldProps = (0, _react.useMemo)(function () {
223
233
  return _objectSpread({
224
234
  controlProps: {
@@ -239,7 +249,8 @@ var TimeZonePicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
239
249
  }, otherProps);
240
250
  }, [emptySearchText, filteredTimezones, otherProps]);
241
251
  return (0, _react2.jsx)(_index.ComboBoxField, (0, _extends2["default"])({}, comboBoxFieldProps, {
242
- disabledKeys: [emptySearchText]
252
+ disabledKeys: [emptySearchText],
253
+ menuTrigger: "focus"
243
254
  }), items);
244
255
  });
245
256
  TimeZonePicker.propTypes = {
package/lib/components/ComboBoxField/ComboBoxField.js CHANGED
@@ -372,7 +372,7 @@ ComboBoxField.propTypes = {
372
372
  })
373
373
  };
374
374
  ComboBoxField.defaultProps = {
375
- menuTrigger: 'input',
375
+ menuTrigger: 'focus',
376
376
  direction: 'bottom',
377
377
  scrollBoxProps: {
378
378
  maxHeight: '300px'
package/lib/components/ComboBoxField/ComboBoxField.test.js CHANGED
@@ -241,7 +241,8 @@ test('should invoke onInputChange', function () {
241
241
  test('should invoke onOpenChange on button click', function () {
242
242
  var onOpenChange = jest.fn();
243
243
  getComponent({
244
- onOpenChange: onOpenChange
244
+ onOpenChange: onOpenChange,
245
+ menuTrigger: 'manual'
245
246
  });
246
247
  var button = screen.queryByRole('button');
247
248
  var listbox = screen.queryByRole('listbox');
@@ -254,7 +255,8 @@ test('should invoke onOpenChange on button click', function () {
254
255
  test('should invoke onOpenChange on input change', function () {
255
256
  var onOpenChange = jest.fn();
256
257
  getComponent({
257
- onOpenChange: onOpenChange
258
+ onOpenChange: onOpenChange,
259
+ menuTrigger: 'input'
258
260
  });
259
261
  var input = screen.queryByRole('combobox');
260
262
  var listbox = screen.queryByRole('listbox');
@@ -267,7 +269,8 @@ test('should invoke onOpenChange on input change', function () {
267
269
  test('should invoke onOpenChange on keyboard arrow down', function () {
268
270
  var onOpenChange = jest.fn();
269
271
  getComponent({
270
- onOpenChange: onOpenChange
272
+ onOpenChange: onOpenChange,
273
+ menuTrigger: 'manual'
271
274
  });
272
275
  var input = screen.queryByRole('combobox');
273
276
  var listbox = screen.queryByRole('listbox');
@@ -280,7 +283,8 @@ test('should invoke onOpenChange on keyboard arrow down', function () {
280
283
  test('should invoke onOpenChange on keyboard arrow up', function () {
281
284
  var onOpenChange = jest.fn();
282
285
  getComponent({
283
- onOpenChange: onOpenChange
286
+ onOpenChange: onOpenChange,
287
+ menuTrigger: 'manual'
284
288
  });
285
289
  var input = screen.queryByRole('combobox');
286
290
  var listbox = screen.queryByRole('listbox');
package/lib/components/TimeZonePicker/TimeZonePicker.js CHANGED
@@ -146,16 +146,16 @@ var TimeZonePicker = /*#__PURE__*/forwardRef(function (props, ref) {
146
146
  return aNum - bNum;
147
147
  };
148
148
 
149
- var items = useMemo(function () {
150
- var _context7;
149
+ var checkIsSelectedItem = function checkIsSelectedItem() {
150
+ return _filterInstanceProperty(timeZones).call(timeZones, function (tz) {
151
+ return tz.timeZone === search;
152
+ }).length > 0;
153
+ };
151
154
 
152
- if (filteredTimezones.length === 0) {
153
- return ___EmotionJSX(Item, {
154
- key: emptySearchText
155
- }, emptySearchText);
156
- }
155
+ var renderTimeZones = function renderTimeZones(timeZonesToRender) {
156
+ var _context7;
157
157
 
158
- return _mapInstanceProperty(_context7 = _sortInstanceProperty(filteredTimezones).call(filteredTimezones, sortByGMT)).call(_context7, function (_ref4) {
158
+ return _mapInstanceProperty(_context7 = _sortInstanceProperty(timeZonesToRender).call(timeZonesToRender, sortByGMT)).call(_context7, function (_ref4) {
159
159
  var gmt = _ref4.gmt,
160
160
  time = _ref4.time,
161
161
  timeZone = _ref4.timeZone;
@@ -177,7 +177,17 @@ var TimeZonePicker = /*#__PURE__*/forwardRef(function (props, ref) {
177
177
  variant: "timeZone.time"
178
178
  }, time))));
179
179
  });
180
- }, [emptySearchText, filteredTimezones]);
180
+ };
181
+
182
+ var items = useMemo(function () {
183
+ if (filteredTimezones.length === 0) {
184
+ return ___EmotionJSX(Item, {
185
+ key: emptySearchText
186
+ }, emptySearchText);
187
+ }
188
+
189
+ return renderTimeZones(checkIsSelectedItem() ? timeZones : filteredTimezones);
190
+ }, [emptySearchText, filteredTimezones, search, timeZones]);
181
191
  var comboBoxFieldProps = useMemo(function () {
182
192
  return _objectSpread({
183
193
  controlProps: {
@@ -198,7 +208,8 @@ var TimeZonePicker = /*#__PURE__*/forwardRef(function (props, ref) {
198
208
  }, otherProps);
199
209
  }, [emptySearchText, filteredTimezones, otherProps]);
200
210
  return ___EmotionJSX(ComboBoxField, _extends({}, comboBoxFieldProps, {
201
- disabledKeys: [emptySearchText]
211
+ disabledKeys: [emptySearchText],
212
+ menuTrigger: "focus"
202
213
  }), items);
203
214
  });
204
215
  TimeZonePicker.propTypes = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pingux/astro",
3
- "version": "1.7.0-alpha.11",
3
+ "version": "1.7.0-alpha.12",
4
4
  "description": "PingUX themeable React component library",
5
5
  "author": "ux-development@pingidentity.com",
6
6
  "license": "Apache-2.0",