Skip to content

Commit f6c883a

Browse files
dcousensemmatown
dcousens
and
emmatown
authored
Move move drag and drop util to @keystar/ui/drag-and-drop, update @keystar/ui LICENSE (#1366)
Co-authored-by: Emma Hamilton <[email protected]> Co-authored-by: Daniel Cousens <[email protected]>
1 parent c65f48b commit f6c883a

File tree

9 files changed

+277
-5
lines changed

9 files changed

+277
-5
lines changed

‎.changeset/license-fix.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@keystar/ui': patch
3+
---
4+
5+
Fix LICENSE to be `MIT AND Apache-2.0`

‎.changeset/shiny-icons-deliver.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@keystatic/core': patch
3+
'@keystar/ui': patch
4+
---
5+
6+
Move `move` drag and drop util to `@keystar/ui/drag-and-drop`

‎design-system/pkg/LICENSE‎

Lines changed: 233 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
1+
This project is licensed under a combination of the MIT License and the Apache License 2.0.
2+
3+
- The MIT License applies to any original code created by Thinkmill Labs Pty Ltd.
4+
- The Apache License 2.0 applies to derivative works inspired by or based on Adobe's React Spectrum.
5+
6+
Please see the full license texts below for details.
7+
8+
--- MIT License ---
9+
MIT License
10+
11+
Copyright (c) Thinkmill Labs Pty Ltd
12+
13+
Permission is hereby granted, free of charge, to any person obtaining a copy
14+
of this software and associated documentation files (the "Software"), to deal
15+
in the Software without restriction, including without limitation the rights
16+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
17+
copies of the Software, and to permit persons to whom the Software is
18+
furnished to do so, subject to the following conditions:
19+
20+
The above copyright notice and this permission notice shall be included in all
21+
copies or substantial portions of the Software.
22+
23+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
26+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
27+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
28+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
29+
SOFTWARE.
30+
31+
--- Apache License 2.0 ---
32+
Apache License
33+
Version 2.0, January 2004
34+
http://www.apache.org/licenses/
35+
36+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
37+
38+
1. Definitions.
39+
40+
"License" shall mean the terms and conditions for use, reproduction,
41+
and distribution as defined by Sections 1 through 9 of this document.
42+
43+
"Licensor" shall mean the copyright owner or entity authorized by
44+
the copyright owner that is granting the License.
45+
46+
"Legal Entity" shall mean the union of the acting entity and all
47+
other entities that control, are controlled by, or are under common
48+
control with that entity. For the purposes of this definition,
49+
"control" means (i) the power, direct or indirect, to cause the
50+
direction or management of such entity, whether by contract or
51+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
52+
outstanding shares, or (iii) beneficial ownership of such entity.
53+
54+
"You" (or "Your") shall mean an individual or Legal Entity
55+
exercising permissions granted by this License.
56+
57+
"Source" form shall mean the preferred form for making modifications,
58+
including but not limited to software source code, documentation
59+
source, and configuration files.
60+
61+
"Object" form shall mean any form resulting from mechanical
62+
transformation or translation of a Source form, including but
63+
not limited to compiled object code, generated documentation,
64+
and conversions to other media types.
65+
66+
"Work" shall mean the work of authorship, whether in Source or
67+
Object form, made available under the License, as indicated by a
68+
copyright notice that is included in or attached to the work
69+
(an example is provided in the Appendix below).
70+
71+
"Derivative Works" shall mean any work, whether in Source or Object
72+
form, that is based on (or derived from) the Work and for which the
73+
editorial revisions, annotations, elaborations, or other modifications
74+
represent, as a whole, an original work of authorship. For the purposes
75+
of this License, Derivative Works shall not include works that remain
76+
separable from, or merely link (or bind by name) to the interfaces of,
77+
the Work and Derivative Works thereof.
78+
79+
"Contribution" shall mean any work of authorship, including
80+
the original version of the Work and any modifications or additions
81+
to that Work or Derivative Works thereof, that is intentionally
82+
submitted to Licensor for inclusion in the Work by the copyright owner
83+
or by an individual or Legal Entity authorized to submit on behalf of
84+
the copyright owner. For the purposes of this definition, "submitted"
85+
means any form of electronic, verbal, or written communication sent
86+
to the Licensor or its representatives, including but not limited to
87+
communication on electronic mailing lists, source code control systems,
88+
and issue tracking systems that are managed by, or on behalf of, the
89+
Licensor for the purpose of discussing and improving the Work, but
90+
excluding communication that is conspicuously marked or otherwise
91+
designated in writing by the copyright owner as "Not a Contribution."
92+
93+
"Contributor" shall mean Licensor and any individual or Legal Entity
94+
on behalf of whom a Contribution has been received by Licensor and
95+
subsequently incorporated within the Work.
96+
97+
2. Grant of Copyright License. Subject to the terms and conditions of
98+
this License, each Contributor hereby grants to You a perpetual,
99+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
100+
copyright license to reproduce, prepare Derivative Works of,
101+
publicly display, publicly perform, sublicense, and distribute the
102+
Work and such Derivative Works in Source or Object form.
103+
104+
3. Grant of Patent License. Subject to the terms and conditions of
105+
this License, each Contributor hereby grants to You a perpetual,
106+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
107+
(except as stated in this section) patent license to make, have made,
108+
use, offer to sell, sell, import, and otherwise transfer the Work,
109+
where such license applies only to those patent claims licensable
110+
by such Contributor that are necessarily infringed by their
111+
Contribution(s) alone or by combination of their Contribution(s)
112+
with the Work to which such Contribution(s) was submitted. If You
113+
institute patent litigation against any entity (including a
114+
cross-claim or counterclaim in a lawsuit) alleging that the Work
115+
or a Contribution incorporated within the Work constitutes direct
116+
or contributory patent infringement, then any patent licenses
117+
granted to You under this License for that Work shall terminate
118+
as of the date such litigation is filed.
119+
120+
4. Redistribution. You may reproduce and distribute copies of the
121+
Work or Derivative Works thereof in any medium, with or without
122+
modifications, and in Source or Object form, provided that You
123+
meet the following conditions:
124+
125+
(a) You must give any other recipients of the Work or
126+
Derivative Works a copy of this License; and
127+
128+
(b) You must cause any modified files to carry prominent notices
129+
stating that You changed the files; and
130+
131+
(c) You must retain, in the Source form of any Derivative Works
132+
that You distribute, all copyright, patent, trademark, and
133+
attribution notices from the Source form of the Work,
134+
excluding those notices that do not pertain to any part of
135+
the Derivative Works; and
136+
137+
(d) If the Work includes a "NOTICE" text file as part of its
138+
distribution, then any Derivative Works that You distribute must
139+
include a readable copy of the attribution notices contained
140+
within such NOTICE file, excluding those notices that do not
141+
pertain to any part of the Derivative Works, in at least one
142+
of the following places: within a NOTICE text file distributed
143+
as part of the Derivative Works; within the Source form or
144+
documentation, if provided along with the Derivative Works; or,
145+
within a display generated by the Derivative Works, if and
146+
wherever such third-party notices normally appear. The contents
147+
of the NOTICE file are for informational purposes only and
148+
do not modify the License. You may add Your own attribution
149+
notices within Derivative Works that You distribute, alongside
150+
or as an addendum to the NOTICE text from the Work, provided
151+
that such additional attribution notices cannot be construed
152+
as modifying the License.
153+
154+
You may add Your own copyright statement to Your modifications and
155+
may provide additional or different license terms and conditions
156+
for use, reproduction, or distribution of Your modifications, or
157+
for any such Derivative Works as a whole, provided Your use,
158+
reproduction, and distribution of the Work otherwise complies with
159+
the conditions stated in this License.
160+
161+
5. Submission of Contributions. Unless You explicitly state otherwise,
162+
any Contribution intentionally submitted for inclusion in the Work
163+
by You to the Licensor shall be under the terms and conditions of
164+
this License, without any additional terms or conditions.
165+
Notwithstanding the above, nothing herein shall supersede or modify
166+
the terms of any separate license agreement you may have executed
167+
with Licensor regarding such Contributions.
168+
169+
6. Trademarks. This License does not grant permission to use the trade
170+
names, trademarks, service marks, or product names of the Licensor,
171+
except as required for reasonable and customary use in describing the
172+
origin of the Work and reproducing the content of the NOTICE file.
173+
174+
7. Disclaimer of Warranty. Unless required by applicable law or
175+
agreed to in writing, Licensor provides the Work (and each
176+
Contributor provides its Contributions) on an "AS IS" BASIS,
177+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
178+
implied, including, without limitation, any warranties or conditions
179+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
180+
PARTICULAR PURPOSE. You are solely responsible for determining the
181+
appropriateness of using or redistributing the Work and assume any
182+
risks associated with Your exercise of permissions under this License.
183+
184+
8. Limitation of Liability. In no event and under no legal theory,
185+
whether in tort (including negligence), contract, or otherwise,
186+
unless required by applicable law (such as deliberate and grossly
187+
negligent acts) or agreed to in writing, shall any Contributor be
188+
liable to You for damages, including any direct, indirect, special,
189+
incidental, or consequential damages of any character arising as a
190+
result of this License or out of the use or inability to use the
191+
Work (including but not limited to damages for loss of goodwill,
192+
work stoppage, computer failure or malfunction, or any and all
193+
other commercial damages or losses), even if such Contributor
194+
has been advised of the possibility of such damages.
195+
196+
9. Accepting Warranty or Additional Liability. While redistributing
197+
the Work or Derivative Works thereof, You may choose to offer,
198+
and charge a fee for, acceptance of support, warranty, indemnity,
199+
or other liability obligations and/or rights consistent with this
200+
License. However, in accepting such obligations, You may act only
201+
on Your own behalf and on Your sole responsibility, not on behalf
202+
of any other Contributor, and only if You agree to indemnify,
203+
defend, and hold each Contributor harmless for any liability
204+
incurred by, or claims asserted against, such Contributor by reason
205+
of your accepting any such warranty or additional liability.
206+
207+
END OF TERMS AND CONDITIONS
208+
209+
APPENDIX: How to apply the Apache License to your work.
210+
211+
To apply the Apache License to your work, attach the following
212+
boilerplate notice, with the fields enclosed by brackets "[]"
213+
replaced with your own identifying information. (Don't include
214+
the brackets!) The text should be enclosed in the appropriate
215+
comment syntax for the file format. We also recommend that a
216+
file or class name and description of purpose be included on the
217+
same "printed page" as the copyright notice for easier
218+
identification within third-party archives.
219+
220+
Copyright 2019 Adobe
221+
222+
Licensed under the Apache License, Version 2.0 (the "License");
223+
you may not use this file except in compliance with the License.
224+
You may obtain a copy of the License at
225+
226+
http://www.apache.org/licenses/LICENSE-2.0
227+
228+
Unless required by applicable law or agreed to in writing, software
229+
distributed under the License is distributed on an "AS IS" BASIS,
230+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
231+
See the License for the specific language governing permissions and
232+
limitations under the License.
233+

‎design-system/pkg/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@keystar/ui",
33
"version": "0.7.13",
4-
"license": "MIT",
4+
"license": "MIT AND Apache-2.0",
55
"main": "",
66
"module": "",
77
"scripts": {

‎design-system/pkg/src/drag-and-drop/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ export type {
4040
RootDropTarget,
4141
TextDropItem,
4242
} from '@react-types/shared';
43+
44+
export { move } from './move';

packages/keystatic/src/form/ui-utils.ts renamed to design-system/pkg/src/drag-and-drop/move.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Copyright 2020 Adobe. All rights reserved.
3+
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License. You may obtain a copy
5+
* of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
*
7+
* Unless required by applicable law or agreed to in writing, software distributed under
8+
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
9+
* OF ANY KIND, either express or implied. See the License for the specific language
10+
* governing permissions and limitations under the License.
11+
*/
12+
113
// https://github.com/adobe/react-spectrum/blob/759ac41ae9683d053044c508d9ec0dccebd3b8dd/packages/%40react-stately/data/src/useListData.ts#L335
214
export function move<T>(
315
items: ReadonlyArray<T>,

‎design-system/pkg/src/style/useMediaQuery.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Copyright 2020 Adobe. All rights reserved.
3+
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License. You may obtain a copy
5+
* of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
*
7+
* Unless required by applicable law or agreed to in writing, software distributed under
8+
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
9+
* OF ANY KIND, either express or implied. See the License for the specific language
10+
* governing permissions and limitations under the License.
11+
*/
12+
113
/* https://github.com/adobe/react-spectrum/blob/main/packages/%40react-spectrum/utils/src/useMediaQuery.ts */
214
import { useIsSSR } from '@react-aria/ssr';
315
import { useEffect, useState } from 'react';

‎packages/keystatic/src/form/fields/array/ui.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import { ActionButton, Button, ButtonGroup } from '@keystar/ui/button';
22
import { Dialog, DialogContainer } from '@keystar/ui/dialog';
3-
import { ItemDropTarget, useDragAndDrop } from '@keystar/ui/drag-and-drop';
3+
import {
4+
ItemDropTarget,
5+
move,
6+
useDragAndDrop,
7+
} from '@keystar/ui/drag-and-drop';
48
import { FieldDescription, FieldLabel, FieldMessage } from '@keystar/ui/field';
59
import { Icon } from '@keystar/ui/icon';
610
import { trash2Icon } from '@keystar/ui/icon/icons/trash2Icon';
@@ -26,7 +30,6 @@ import {
2630
import { previewPropsToValue, valueToUpdater } from '../../get-value';
2731
import { getInitialPropsValue } from '../../initial-values';
2832
import { createGetPreviewProps } from '../../preview-props';
29-
import { move } from '../../ui-utils';
3033

3134
import { useEventCallback } from '../document/DocumentEditor/ui-utils';
3235

‎packages/keystatic/src/form/fields/multiRelationship/ui.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useReducer, useMemo, useState, useEffect, Key } from 'react';
44

55
import { ActionBar, ActionBarContainer } from '@keystar/ui/action-bar';
66
import { Combobox } from '@keystar/ui/combobox';
7-
import { useDragAndDrop } from '@keystar/ui/drag-and-drop';
7+
import { move, useDragAndDrop } from '@keystar/ui/drag-and-drop';
88
import { Icon } from '@keystar/ui/icon';
99
import { trash2Icon } from '@keystar/ui/icon/icons/trash2Icon';
1010
import { VStack } from '@keystar/ui/layout';
@@ -15,7 +15,6 @@ import { Text } from '@keystar/ui/typography';
1515
import { FormFieldInputProps } from '../../api';
1616
import { useSlugsInCollection } from '../../../app/useSlugsInCollection';
1717
import { ExtraFieldInputProps } from '../../form-from-preview';
18-
import { move } from '../../ui-utils';
1918
import { validateMultiRelationshipLength } from './validate';
2019

2120
export function MultiRelationshipInput(

0 commit comments

Comments
 (0)