@pingux/astro 2.39.0 → 2.40.0-alpha.0

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.
@@ -1,16 +1,34 @@
1
1
  "use strict";
2
2
 
3
3
  var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
4
- var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
5
4
  var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
5
+ var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
6
+ var _Object$create = require("@babel/runtime-corejs3/core-js-stable/object/create");
7
+ var _Object$getPrototypeOf = require("@babel/runtime-corejs3/core-js-stable/object/get-prototype-of");
8
+ var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
9
+ var _Object$setPrototypeOf = require("@babel/runtime-corejs3/core-js-stable/object/set-prototype-of");
10
+ var _Promise = require("@babel/runtime-corejs3/core-js-stable/promise");
11
+ var _reverseInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/reverse");
12
+ var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
13
+ var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
14
+ var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
15
+ var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
6
16
  var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
17
+ var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
18
+ var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
19
+ var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
7
20
  var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
21
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
22
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
23
+ var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
24
+ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
8
25
  var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
9
26
  var _react = _interopRequireWildcard(require("react"));
10
27
  var _reactStately = require("react-stately");
11
28
  var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
12
29
  var _propTypes = _interopRequireDefault(require("prop-types"));
13
30
  var _index = require("../../index");
31
+ var _dndMocks = require("../../utils/testUtils/dndMocks");
14
32
  var _testWrapper = require("../../utils/testUtils/testWrapper");
15
33
  var _universalComponentTest = require("../../utils/testUtils/universalComponentTest");
16
34
  var _TreeView = require("./TreeView");
@@ -18,10 +36,12 @@ var _TreeViewKeyboardDelegate = require("./TreeViewKeyboardDelegate.test");
18
36
  var _TreeViewSection = require("./TreeViewSection");
19
37
  var _ = _interopRequireDefault(require("."));
20
38
  var _react2 = require("@emotion/react");
39
+ var _context; // Needs to be added to each components test file
21
40
  function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
22
41
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
23
- // Needs to be added to each components test file
24
-
42
+ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
43
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context5, _context6; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(source), !0)).call(_context5, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context6 = ownKeys(Object(source))).call(_context6, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
44
+ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = _Object$defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof _Symbol ? _Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return _Object$defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = _Object$create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = _Object$getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = _Object$create(IteratorPrototype); function defineIteratorMethods(prototype) { var _context3; _forEachInstanceProperty(_context3 = ["next", "throw", "return"]).call(_context3, function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], _forEachInstanceProperty(tryLocsList).call(tryLocsList, pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return _Object$setPrototypeOf ? _Object$setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = _Object$create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = _Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return _reverseInstanceProperty(keys).call(keys), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { var _context4; if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, _forEachInstanceProperty(_context4 = this.tryEntries).call(_context4, resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+_sliceInstanceProperty(name).call(name, 1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
25
45
  var testId = 'test-TreeView';
26
46
  var defaultProps = {
27
47
  'data-testid': testId,
@@ -59,6 +79,61 @@ var data = [{
59
79
  var singleData = [{
60
80
  title: 'Single Item'
61
81
  }];
82
+ var exampleItem = {
83
+ items: [{
84
+ key: 'testChild',
85
+ parentKey: 'testKey',
86
+ items: [{
87
+ key: 'last',
88
+ title: 'last',
89
+ parentKey: 'testChild'
90
+ }],
91
+ children: [{
92
+ key: 'last',
93
+ title: 'last',
94
+ parentKey: 'testChild'
95
+ }],
96
+ title: 'testChild'
97
+ }],
98
+ key: 'testKey',
99
+ parentKey: 'parent',
100
+ title: 'testKey'
101
+ };
102
+ var exampleItemWithChildren = {
103
+ items: [{
104
+ key: 'testChild',
105
+ parentKey: 'testKey',
106
+ items: [{
107
+ key: 'last',
108
+ title: 'last',
109
+ parentKey: 'testChild'
110
+ }],
111
+ children: [{
112
+ key: 'last',
113
+ title: 'last',
114
+ parentKey: 'testChild'
115
+ }],
116
+ title: 'testChild'
117
+ }],
118
+ children: [{
119
+ key: 'testChild',
120
+ parentKey: 'testKey',
121
+ items: [{
122
+ key: 'last',
123
+ title: 'last',
124
+ parentKey: 'testChild'
125
+ }],
126
+ children: [{
127
+ key: 'last',
128
+ title: 'last',
129
+ parentKey: 'testChild'
130
+ }],
131
+ title: 'testChild'
132
+ }],
133
+ key: 'testKey',
134
+ parentKey: 'parent',
135
+ title: 'testKey'
136
+ };
62
137
  var TreeViewComponent = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
63
138
  var tree = (0, _reactStately.useTreeData)({
64
139
  initialItems: props.data,
@@ -90,6 +165,33 @@ var offsetWidth;
90
165
  var offsetHeight;
91
166
  var scrollHeight;
92
167
  var onSelectionChange = jest.fn();
168
+ var treeInsert = jest.fn();
169
+ var treeRemove = jest.fn();
170
+ var treeMove = jest.fn();
171
+ var treeInsertBefore = jest.fn();
172
+ var treeInsertAfter = jest.fn();
173
+ var tree = {
174
+ insert: treeInsert,
175
+ remove: treeRemove,
176
+ move: treeMove,
177
+ insertBefore: treeInsertBefore,
178
+ insertAfter: treeInsertAfter
179
+ };
180
+ var toggleStateKey = jest.fn();
181
+ var state = {
182
+ expandedKeys: new _set["default"](),
183
+ toggleKey: toggleStateKey
184
+ };
185
+ var stateExpanded = {
186
+ expandedKeys: new _set["default"]((0, _concat["default"])(_context = []).call(_context, 'Expanded')),
187
+ toggleKey: toggleStateKey
188
+ };
189
+ var thisEventTarget = {
190
+ key: 'testTarget'
191
+ };
192
+ var expandedEventTarget = {
193
+ key: 'Expanded'
194
+ };
93
195
  beforeAll(function () {
94
196
  offsetWidth = jest.spyOn(window.HTMLElement.prototype, 'clientWidth', 'get').mockImplementation(function () {
95
197
  return 1000;
@@ -105,6 +207,19 @@ beforeAll(function () {
105
207
  });
106
208
  jest.useFakeTimers();
107
209
  });
210
+ beforeEach(function () {
211
+ jest.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function () {
212
+ return {
213
+ left: 0,
214
+ top: 0,
215
+ x: 0,
216
+ y: 0,
217
+ width: 100,
218
+ height: 50
219
+ };
220
+ });
221
+ jest.useFakeTimers();
222
+ });
108
223
  afterEach(function () {
109
224
  onSelectionChange.mockClear();
110
225
  });
@@ -119,7 +234,9 @@ afterAll(function () {
119
234
  }
120
235
  });
121
236
  test('TreeView component does load', function () {
122
- (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, null));
237
+ (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
238
+ data: data
239
+ }));
123
240
  var element = _testWrapper.screen.queryByRole('treegrid');
124
241
  expect(element).toBeInTheDocument();
125
242
  });
@@ -133,6 +250,8 @@ test('Can select an Item using the mouse', function () {
133
250
  expect(peopleElement).not.toHaveClass('is-selected');
134
251
  _userEvent["default"].click(peopleElement);
135
252
  expect(peopleElement).toHaveClass('is-selected');
253
+ _testWrapper.fireEvent.click(peopleElement);
254
+ expect(peopleElement).not.toHaveClass('is-selected');
136
255
  });
137
256
  test('Renders both Sections and Items', function () {
138
257
  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
@@ -160,6 +279,16 @@ test('Can expand an Item using the mouse', function () {
160
279
  _userEvent["default"].click(buttons[0]);
161
280
  expect(_testWrapper.screen.queryByText(data[0].items[0].title)).toBeInTheDocument();
162
281
  });
282
+ test('Focus moves using keyboard', function () {
283
+ (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
284
+ data: data
285
+ }));
286
+ _userEvent["default"].tab();
287
+ expect(_testWrapper.screen.queryByText('Policies')).toHaveClass('is-focused');
288
+ _userEvent["default"].tab();
289
+ expect(_testWrapper.screen.queryByText('Policies')).not.toHaveClass('is-focused');
290
+ expect(_testWrapper.screen.queryAllByRole('button')[0]).toHaveClass('is-focused');
291
+ });
163
292
  test('onExpandedChange change prop calls when used', function () {
164
293
  var onPress = jest.fn();
165
294
  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
@@ -207,9 +336,16 @@ test('onKeyDown calls passed in prop call back function', function () {
207
336
  data: data,
208
337
  onKeyDown: callback
209
338
  }));
210
- var listItems = _testWrapper.screen.queryAllByRole('row');
339
+ var listItems = _testWrapper.screen.queryAllByRole('gridcell');
211
340
  var thisItem = listItems[0];
212
- _userEvent["default"].type(thisItem, '{arrowleft}');
341
+ _testWrapper.fireEvent.keyDown(thisItem, {
342
+ key: 'ArrowLeft',
343
+ keyCode: 37
344
+ });
345
+ _testWrapper.fireEvent.keyUp(thisItem, {
346
+ key: 'ArrowLeft',
347
+ keyCode: 37
348
+ });
213
349
  expect(callback).toHaveBeenCalled();
214
350
  });
215
351
  test('onKeyDown calls passed in prop call back function', function () {
@@ -218,9 +354,16 @@ test('onKeyDown calls passed in prop call back function', function () {
218
354
  data: data,
219
355
  onKeyDown: callback
220
356
  }));
221
- var listItems = _testWrapper.screen.queryAllByRole('row');
357
+ var listItems = _testWrapper.screen.queryAllByRole('gridcell');
222
358
  var thisItem = listItems[2];
223
- _userEvent["default"].type(thisItem, '{arrowleft}');
359
+ _testWrapper.fireEvent.keyDown(thisItem, {
360
+ key: 'ArrowLeft',
361
+ keyCode: 37
362
+ });
363
+ _testWrapper.fireEvent.keyUp(thisItem, {
364
+ key: 'ArrowLeft',
365
+ keyCode: 37
366
+ });
224
367
  expect(callback).toHaveBeenCalled();
225
368
  });
226
369
  test('onKeyDown does not call passed in prop call back function', function () {
@@ -233,6 +376,78 @@ test('onKeyDown does not call passed in prop call back function', function () {
233
376
  _userEvent["default"].type(thisItem, '{arrowleft}');
234
377
  expect(callback).not.toHaveBeenCalled();
235
378
  });
379
+ test('onDragStart calls passed in prop call back function', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
380
+ var callback, secondCallback, listItems, element, target, dataTransfer;
381
+ return _regeneratorRuntime().wrap(function _callee$(_context2) {
382
+ while (1) switch (_context2.prev = _context2.next) {
383
+ case 0:
384
+ callback = jest.fn();
385
+ secondCallback = jest.fn();
386
+ (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
387
+ data: data,
388
+ onDragStart: callback,
389
+ onDrop: secondCallback
390
+ }));
391
+ listItems = _testWrapper.screen.queryAllByRole('gridcell');
392
+ element = listItems[2];
393
+ target = listItems[1];
394
+ expect(listItems.length).toBe(3);
395
+ dataTransfer = new _dndMocks.DataTransfer();
396
+ (0, _testWrapper.fireEvent)(element, new _dndMocks.DragEvent('dragstart', {
397
+ dataTransfer: dataTransfer,
398
+ clientX: 0,
399
+ clientY: 0
400
+ }));
401
+ (0, _testWrapper.act)(function () {
402
+ return jest.runAllTimers();
403
+ });
404
+ expect(callback).toHaveBeenCalled();
405
+ (0, _testWrapper.fireEvent)(element, new _dndMocks.DragEvent('drag', {
406
+ dataTransfer: dataTransfer,
407
+ clientX: 1,
408
+ clientY: 1
409
+ }));
410
+ (0, _testWrapper.fireEvent)(target, new _dndMocks.DragEvent('dragenter', {
411
+ dataTransfer: dataTransfer,
412
+ clientX: 1,
413
+ clientY: 1
414
+ }));
415
+ (0, _testWrapper.fireEvent)(target, new _dndMocks.DragEvent('dragover', {
416
+ dataTransfer: dataTransfer,
417
+ clientX: 51,
418
+ clientY: 51
419
+ }));
420
+ expect(target).toHaveAttribute('data-droptarget', 'true');
421
+ _context2.next = 17;
422
+ return (0, _testWrapper.fireEvent)(target, new _dndMocks.DragEvent('drop', {
423
+ dataTransfer: dataTransfer,
424
+ clientX: 51,
425
+ clientY: 51
426
+ }));
427
+ case 17:
428
+ (0, _testWrapper.act)(function () {
429
+ return jest.runAllTimers();
430
+ });
431
+ _context2.next = 20;
432
+ return (0, _testWrapper.fireEvent)(element, new _dndMocks.DragEvent('dragend', {
433
+ dataTransfer: dataTransfer,
434
+ clientX: 51,
435
+ clientY: 51
436
+ }));
437
+ case 20:
438
+ expect(secondCallback).toHaveBeenCalled();
439
+ expect(function () {
440
+ return (0, _testWrapper.within)(target).getByText('Other A');
441
+ });
442
+ expect(function () {
443
+ return (0, _testWrapper.within)(target).getByText('Single Item');
444
+ });
445
+ case 23:
446
+ case "end":
447
+ return _context2.stop();
448
+ }
449
+ }, _callee);
450
+ })));
236
451
  test('items still render if there is only one provided', function () {
237
452
  var callback = jest.fn();
238
453
  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
@@ -275,4 +490,39 @@ test('Handler function does not add ref to array', function () {
275
490
  current: 'currentlystilltesting'
276
491
  });
277
492
  expect(newArray).toHaveLength(3);
493
+ });
494
+ test('insertItem is called', function () {
495
+ (0, _TreeView.dropItem)(_objectSpread(_objectSpread({}, thisEventTarget), {}, {
496
+ dropPosition: 'on'
497
+ }), tree, state, exampleItem);
498
+ expect(treeMove).toHaveBeenCalled();
499
+ expect(toggleStateKey).toHaveBeenCalled();
500
+ });
501
+ test('insertItem is called, but does not call toggle key', function () {
502
+ (0, _TreeView.dropItem)(_objectSpread(_objectSpread({}, expandedEventTarget), {}, {
503
+ dropPosition: 'on'
504
+ }), tree, stateExpanded, exampleItem);
505
+ expect(treeMove).toHaveBeenCalled();
506
+ expect(toggleStateKey).not.toHaveBeenCalled();
507
+ });
508
+ test('insertItemToPosition is called with after', function () {
509
+ (0, _TreeView.dropItem)(_objectSpread(_objectSpread({}, thisEventTarget), {}, {
510
+ dropPosition: 'after'
511
+ }), tree, state, exampleItem);
512
+ expect(treeInsertAfter).toHaveBeenCalled();
513
+ expect(treeRemove).toHaveBeenCalled();
514
+ });
515
+ test('insertItemToPosition is called with before', function () {
516
+ (0, _TreeView.dropItem)(_objectSpread(_objectSpread({}, thisEventTarget), {}, {
517
+ dropPosition: 'before'
518
+ }), tree, state, exampleItem);
519
+ expect(treeInsertBefore).toHaveBeenCalled();
520
+ expect(treeRemove).toHaveBeenCalled();
521
+ });
522
+ test('insertItemToPosition is called with an item that has children', function () {
523
+ (0, _TreeView.dropItem)(_objectSpread(_objectSpread({}, thisEventTarget), {}, {
524
+ dropPosition: 'before'
525
+ }), tree, state, exampleItemWithChildren);
526
+ expect(treeInsertBefore).toHaveBeenCalled();
527
+ expect(treeRemove).toHaveBeenCalled();
278
528
  });
@@ -9,19 +9,15 @@ _Object$defineProperty(exports, "__esModule", {
9
9
  value: true
10
10
  });
11
11
  exports.onKeyDownItem = exports["default"] = void 0;
12
- var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
13
12
  var _react = _interopRequireWildcard(require("react"));
14
13
  var _FileIcon = _interopRequireDefault(require("@pingux/mdi-react/FileIcon"));
15
- var _focus = require("@react-aria/focus");
16
14
  var _listbox = require("@react-aria/listbox");
17
- var _utils = require("@react-aria/utils");
18
15
  var _propTypes = _interopRequireDefault(require("prop-types"));
19
16
  var _TreeViewContext = require("../../context/TreeViewContext");
20
- var _hooks = require("../../hooks");
21
17
  var _index = require("../../index");
18
+ var _InsertionIndicator = _interopRequireDefault(require("./InsertionIndicator"));
22
19
  var _TreeViewKeyboardDelegate = require("./TreeViewKeyboardDelegate");
23
20
  var _TreeViewRow = _interopRequireDefault(require("./TreeViewRow"));
24
- var _TreeViewSection = require("./TreeViewSection");
25
21
  var _react2 = require("@emotion/react");
26
22
  function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
27
23
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -85,82 +81,58 @@ var TreeViewItem = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
85
81
  state = _useTreeViewContext.state,
86
82
  tree = _useTreeViewContext.tree,
87
83
  refArray = _useTreeViewContext.refArray,
88
- setRefs = _useTreeViewContext.setRefs,
89
84
  flatKeyArray = _useTreeViewContext.flatKeyArray,
90
- pageLength = _useTreeViewContext.pageLength,
91
- setLastFocusedItem = _useTreeViewContext.setLastFocusedItem;
85
+ dragState = _useTreeViewContext.dragState,
86
+ dropState = _useTreeViewContext.dropState,
87
+ pageLength = _useTreeViewContext.pageLength;
92
88
  var _useOption = (0, _listbox.useOption)({
93
89
  key: key
94
90
  }, state, treeItemRef),
95
- optionProps = _useOption.optionProps,
96
91
  isSelected = _useOption.isSelected,
97
92
  isDisabled = _useOption.isDisabled;
98
93
  var isExpanded = state.expandedKeys.has(key);
94
+ var isDragging = dragState.isDragging(item.key);
99
95
  var onKeyDownFunction = function onKeyDownFunction(e) {
100
- /* istanbul ignore next */
101
96
  onKeyDownItem(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength);
102
97
  if (onKeyDown) {
103
98
  onKeyDown(e, key);
104
99
  }
105
100
  };
106
-
107
- // ignoring from tests, but this is actually being unit tested
108
- /* istanbul ignore next */
109
- var removeRefFromArray = function removeRefFromArray() {
110
- setRefs(function (prev) {
111
- return (0, _TreeViewSection.removeRefFromArrayHelper)(prev, key);
112
- });
113
- };
114
- var addRefToArray = function addRefToArray() {
115
- setRefs(function (prev) {
116
- return (0, _TreeViewSection.addRefToArrayHelper)(prev, key, treeItemRef);
117
- });
118
- };
119
-
120
- // adds and removes refs on mount and dismount
121
- /* istanbul ignore next */
122
- (0, _react.useEffect)(function () {
123
- // this runs on mount
124
- addRefToArray();
125
- return function () {
126
- // this runs on cleanup
127
- removeRefFromArray(key, refArray);
128
- };
129
- }, []);
130
- var _useFocusRing = (0, _focus.useFocusRing)(),
131
- isFocusVisible = _useFocusRing.isFocusVisible,
132
- focusProps = _useFocusRing.focusProps;
133
- var mergedProps = (0, _utils.mergeProps)(focusProps, optionProps, {
134
- onFocus: function onFocus() {
135
- return setLastFocusedItem(key);
136
- }
137
- });
138
- var _useStatusClasses = (0, _hooks.useStatusClasses)('', {
139
- isFocused: isFocusVisible
140
- }),
141
- classNames = _useStatusClasses.classNames;
142
- return (0, _react2.jsx)(_index.Box, (0, _extends2["default"])({
101
+ return (0, _react2.jsx)(_react["default"].Fragment, null, (0, _react2.jsx)(_InsertionIndicator["default"], {
102
+ target: {
103
+ type: 'item',
104
+ key: item.key,
105
+ dropPosition: 'before'
106
+ },
107
+ dropState: dropState
108
+ }), (0, _react2.jsx)(_index.Box, {
143
109
  isRow: true,
144
110
  ref: treeItemRef,
145
- "aria-disabled": isDisabled
146
- }, mergedProps, {
111
+ "aria-disabled": isDisabled,
147
112
  role: "row",
148
113
  variant: "treeView.wrapper",
149
- className: classNames,
150
114
  "aria-selected": isSelected,
151
115
  "aria-level": level,
152
116
  "aria-posinset": position + 1,
153
- "aria-setsize": setSize,
154
- onKeyDown: function onKeyDown(e) {
155
- return onKeyDownFunction(e);
156
- }
157
- }), (0, _react2.jsx)(_TreeViewRow["default"], {
117
+ "aria-setsize": setSize
118
+ }, (0, _react2.jsx)(_TreeViewRow["default"], {
158
119
  item: item,
159
120
  title: title,
160
121
  mainIcon: _FileIcon["default"],
161
122
  isSelected: isSelected,
162
123
  isExpanded: isExpanded,
163
- isDisabled: isDisabled
124
+ isDisabled: isDisabled,
125
+ isDragging: isDragging,
126
+ onKeyDown: function onKeyDown(e) {
127
+ return onKeyDownFunction(e);
128
+ }
129
+ })), (0, _react2.jsx)(_InsertionIndicator["default"], {
130
+ target: {
131
+ type: 'item',
132
+ key: item.key,
133
+ dropPosition: 'after'
134
+ },
135
+ dropState: dropState
164
136
  }));
165
137
  });
166
138
  TreeViewItem.propTypes = {
@@ -296,6 +296,25 @@ test('onDownPress calls when down Arrow is pressed and expanded', function () {
296
296
  });
297
297
  expect(refFocus).toHaveBeenCalled();
298
298
  });
299
+ test('nothing happens when a unspecified key is pressed', function () {
300
+ getComponent({
301
+ onKeyDown: _TreeViewSection.onKeyDownSection
302
+ });
303
+ var button = _testWrapper.screen.getByRole('button');
304
+ _testWrapper.fireEvent.keyDown(button, {
305
+ key: 'a',
306
+ keyCode: 65
307
+ });
308
+ _testWrapper.fireEvent.keyUp(button, {
309
+ key: 'a',
310
+ keyCode: 65
311
+ });
312
+ expect(refFocus).not.toHaveBeenCalled();
313
+ expect(focusNext).not.toHaveBeenCalled();
314
+ expect(focusPrevious).not.toHaveBeenCalled();
315
+ expect(setSelectedKeys).not.toHaveBeenCalled();
316
+ expect(toggleKey).not.toHaveBeenCalled();
317
+ });
299
318
  test('onUpPress calls when down Arrow is pressed and expanded', function () {
300
319
  getComponent({
301
320
  onKeyDown: _TreeViewSection.onKeyDownSection