From f6c883aa8d2da2c484e6e0105d59a85ed1859a63 Mon Sep 17 00:00:00 2001 From: Daniel Cousens <413395+dcousens@users.noreply.github.com> Date: Thu, 28 Nov 2024 16:33:35 +1100 Subject: [PATCH] Move `move` drag and drop util to `@keystar/ui/drag-and-drop`, update `@keystar/ui` LICENSE (#1366) Co-authored-by: Emma Hamilton Co-authored-by: Daniel Cousens --- .changeset/license-fix.md | 5 + .changeset/shiny-icons-deliver.md | 6 + design-system/pkg/LICENSE | 233 ++++++++++++++++++ design-system/pkg/package.json | 2 +- design-system/pkg/src/drag-and-drop/index.ts | 2 + .../pkg/src/drag-and-drop/move.ts | 12 + design-system/pkg/src/style/useMediaQuery.ts | 12 + .../keystatic/src/form/fields/array/ui.tsx | 7 +- .../src/form/fields/multiRelationship/ui.tsx | 3 +- 9 files changed, 277 insertions(+), 5 deletions(-) create mode 100644 .changeset/license-fix.md create mode 100644 .changeset/shiny-icons-deliver.md create mode 100644 design-system/pkg/LICENSE rename packages/keystatic/src/form/ui-utils.ts => design-system/pkg/src/drag-and-drop/move.ts (66%) diff --git a/.changeset/license-fix.md b/.changeset/license-fix.md new file mode 100644 index 000000000..ba59ecd08 --- /dev/null +++ b/.changeset/license-fix.md @@ -0,0 +1,5 @@ +--- +'@keystar/ui': patch +--- + +Fix LICENSE to be `MIT AND Apache-2.0` diff --git a/.changeset/shiny-icons-deliver.md b/.changeset/shiny-icons-deliver.md new file mode 100644 index 000000000..f0ed4c01d --- /dev/null +++ b/.changeset/shiny-icons-deliver.md @@ -0,0 +1,6 @@ +--- +'@keystatic/core': patch +'@keystar/ui': patch +--- + +Move `move` drag and drop util to `@keystar/ui/drag-and-drop` diff --git a/design-system/pkg/LICENSE b/design-system/pkg/LICENSE new file mode 100644 index 000000000..5084fba3d --- /dev/null +++ b/design-system/pkg/LICENSE @@ -0,0 +1,233 @@ +This project is licensed under a combination of the MIT License and the Apache License 2.0. + +- The MIT License applies to any original code created by Thinkmill Labs Pty Ltd. +- The Apache License 2.0 applies to derivative works inspired by or based on Adobe's React Spectrum. + +Please see the full license texts below for details. + +--- MIT License --- +MIT License + +Copyright (c) Thinkmill Labs Pty Ltd + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- Apache License 2.0 --- + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2019 Adobe + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/design-system/pkg/package.json b/design-system/pkg/package.json index 7abc3a8aa..c968597c1 100644 --- a/design-system/pkg/package.json +++ b/design-system/pkg/package.json @@ -1,7 +1,7 @@ { "name": "@keystar/ui", "version": "0.7.13", - "license": "MIT", + "license": "MIT AND Apache-2.0", "main": "", "module": "", "scripts": { diff --git a/design-system/pkg/src/drag-and-drop/index.ts b/design-system/pkg/src/drag-and-drop/index.ts index cfc1d5166..3ddb47c4f 100644 --- a/design-system/pkg/src/drag-and-drop/index.ts +++ b/design-system/pkg/src/drag-and-drop/index.ts @@ -40,3 +40,5 @@ export type { RootDropTarget, TextDropItem, } from '@react-types/shared'; + +export { move } from './move'; diff --git a/packages/keystatic/src/form/ui-utils.ts b/design-system/pkg/src/drag-and-drop/move.ts similarity index 66% rename from packages/keystatic/src/form/ui-utils.ts rename to design-system/pkg/src/drag-and-drop/move.ts index b0eba9b72..01e4d05c6 100644 --- a/packages/keystatic/src/form/ui-utils.ts +++ b/design-system/pkg/src/drag-and-drop/move.ts @@ -1,3 +1,15 @@ +/* + * Copyright 2020 Adobe. All rights reserved. + * This file is licensed to you under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under + * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS + * OF ANY KIND, either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ + // https://github.com/adobe/react-spectrum/blob/759ac41ae9683d053044c508d9ec0dccebd3b8dd/packages/%40react-stately/data/src/useListData.ts#L335 export function move( items: ReadonlyArray, diff --git a/design-system/pkg/src/style/useMediaQuery.ts b/design-system/pkg/src/style/useMediaQuery.ts index eb4d024db..bef16b0a4 100644 --- a/design-system/pkg/src/style/useMediaQuery.ts +++ b/design-system/pkg/src/style/useMediaQuery.ts @@ -1,3 +1,15 @@ +/* + * Copyright 2020 Adobe. All rights reserved. + * This file is licensed to you under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under + * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS + * OF ANY KIND, either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ + /* https://github.com/adobe/react-spectrum/blob/main/packages/%40react-spectrum/utils/src/useMediaQuery.ts */ import { useIsSSR } from '@react-aria/ssr'; import { useEffect, useState } from 'react'; diff --git a/packages/keystatic/src/form/fields/array/ui.tsx b/packages/keystatic/src/form/fields/array/ui.tsx index eb75ccb5f..da84f9220 100644 --- a/packages/keystatic/src/form/fields/array/ui.tsx +++ b/packages/keystatic/src/form/fields/array/ui.tsx @@ -1,6 +1,10 @@ import { ActionButton, Button, ButtonGroup } from '@keystar/ui/button'; import { Dialog, DialogContainer } from '@keystar/ui/dialog'; -import { ItemDropTarget, useDragAndDrop } from '@keystar/ui/drag-and-drop'; +import { + ItemDropTarget, + move, + useDragAndDrop, +} from '@keystar/ui/drag-and-drop'; import { FieldDescription, FieldLabel, FieldMessage } from '@keystar/ui/field'; import { Icon } from '@keystar/ui/icon'; import { trash2Icon } from '@keystar/ui/icon/icons/trash2Icon'; @@ -26,7 +30,6 @@ import { import { previewPropsToValue, valueToUpdater } from '../../get-value'; import { getInitialPropsValue } from '../../initial-values'; import { createGetPreviewProps } from '../../preview-props'; -import { move } from '../../ui-utils'; import { useEventCallback } from '../document/DocumentEditor/ui-utils'; diff --git a/packages/keystatic/src/form/fields/multiRelationship/ui.tsx b/packages/keystatic/src/form/fields/multiRelationship/ui.tsx index a7db656b6..81bd016d2 100644 --- a/packages/keystatic/src/form/fields/multiRelationship/ui.tsx +++ b/packages/keystatic/src/form/fields/multiRelationship/ui.tsx @@ -4,7 +4,7 @@ import { useReducer, useMemo, useState, useEffect, Key } from 'react'; import { ActionBar, ActionBarContainer } from '@keystar/ui/action-bar'; import { Combobox } from '@keystar/ui/combobox'; -import { useDragAndDrop } from '@keystar/ui/drag-and-drop'; +import { move, useDragAndDrop } from '@keystar/ui/drag-and-drop'; import { Icon } from '@keystar/ui/icon'; import { trash2Icon } from '@keystar/ui/icon/icons/trash2Icon'; import { VStack } from '@keystar/ui/layout'; @@ -15,7 +15,6 @@ import { Text } from '@keystar/ui/typography'; import { FormFieldInputProps } from '../../api'; import { useSlugsInCollection } from '../../../app/useSlugsInCollection'; import { ExtraFieldInputProps } from '../../form-from-preview'; -import { move } from '../../ui-utils'; import { validateMultiRelationshipLength } from './validate'; export function MultiRelationshipInput(