From 55e583ac75fa2e423e443d69f667e67637b7bac1 Mon Sep 17 00:00:00 2001 From: Acbox liu <850625057@qq.com> Date: Thu, 1 Aug 2024 10:19:19 +0800 Subject: [PATCH] feat(mods): mod-table 30% completed --- examples/package.json | 2 + examples/scene1.ts | 9 +- mods/mod-layout/src/column.ts | 3 +- mods/mod-layout/src/row.ts | 3 +- mods/mod-skottie/src/index.ts | 3 +- mods/mod-table/.npmignore | 1 + mods/mod-table/LICENSE | 201 ++++++++++++++++++++++++++++++ mods/mod-table/README.md | 0 mods/mod-table/package.json | 38 ++++++ mods/mod-table/src/index.ts | 124 ++++++++++++++++++ mods/mod-table/tsup.config.ts | 1 + mods/mod-table/typedoc.json | 4 + mods/mod-text-editor/src/index.ts | 3 +- pnpm-lock.yaml | 38 ++++++ 14 files changed, 421 insertions(+), 9 deletions(-) create mode 100644 mods/mod-table/.npmignore create mode 100644 mods/mod-table/LICENSE create mode 100644 mods/mod-table/README.md create mode 100644 mods/mod-table/package.json create mode 100644 mods/mod-table/src/index.ts create mode 100644 mods/mod-table/tsup.config.ts create mode 100644 mods/mod-table/typedoc.json diff --git a/examples/package.json b/examples/package.json index 41f747c00..4e02c3847 100644 --- a/examples/package.json +++ b/examples/package.json @@ -9,6 +9,8 @@ "@newcar/mod-math": "workspace:*", "@newcar/mod-layout": "workspace:*", "@newcar/mod-skottie": "workspace:*", + "@newcar/mod-text-editor": "workspace:*", + "@newcar/mod-table": "workspace:*", "@newcar/plugin-debug": "workspace:*", "@newcar/plugin-timeview": "workspace:*", "@types/luxon": "^3.4.2", diff --git a/examples/scene1.ts b/examples/scene1.ts index bfe713a35..2f1ed3ce6 100644 --- a/examples/scene1.ts +++ b/examples/scene1.ts @@ -1,12 +1,11 @@ import {Circle, Color, createScene, move, Rect, Widget, useFont} from 'newcar' -import TextEditor from "@newcar/mod-text-editor"; +import TextEditor from "@newcar/mod-text-editor" +import { Table } from "@newcar/mod-table"; await useFont('./default.ttf') export default createScene( - new TextEditor('Hello', { - x: 100, - y: 100, - }) + new Table(4, 4) + .setItem(new Rect(100, 100), 2, 2) // new Widget() ) \ No newline at end of file diff --git a/mods/mod-layout/src/column.ts b/mods/mod-layout/src/column.ts index 99a7f5d8c..c77de0b8f 100644 --- a/mods/mod-layout/src/column.ts +++ b/mods/mod-layout/src/column.ts @@ -12,7 +12,8 @@ export class Column extends Widget { height: Ref constructor(height: number, options?: ColumnOptions) { - super(options) + options.style ??= {} + super(options ?? {}) this.height = ref(height) } diff --git a/mods/mod-layout/src/row.ts b/mods/mod-layout/src/row.ts index 81243f7b3..6f18b8032 100644 --- a/mods/mod-layout/src/row.ts +++ b/mods/mod-layout/src/row.ts @@ -12,7 +12,8 @@ export class Row extends Widget { width: Ref constructor(width: number, options?: RowOptions) { - super(options) + options.style ??= {} + super(options ?? {}) this.width = ref(width) } diff --git a/mods/mod-skottie/src/index.ts b/mods/mod-skottie/src/index.ts index f92e60396..1bcaecf68 100644 --- a/mods/mod-skottie/src/index.ts +++ b/mods/mod-skottie/src/index.ts @@ -17,7 +17,8 @@ export class Skottie extends Widget { private frameCounter = 0 constructor(json: string, width: number, height: number, options?: SkottieOptions) { - super(options) + options.style ??= {} + super(options ?? {}) this.json = ref(json) this.width = ref(width) this.height = ref(height) diff --git a/mods/mod-table/.npmignore b/mods/mod-table/.npmignore new file mode 100644 index 000000000..dbc869080 --- /dev/null +++ b/mods/mod-table/.npmignore @@ -0,0 +1 @@ +/src \ No newline at end of file diff --git a/mods/mod-table/LICENSE b/mods/mod-table/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/mods/mod-table/LICENSE @@ -0,0 +1,201 @@ + 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 [yyyy] [name of copyright owner] + + 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/mods/mod-table/README.md b/mods/mod-table/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/mods/mod-table/package.json b/mods/mod-table/package.json new file mode 100644 index 000000000..ffef29417 --- /dev/null +++ b/mods/mod-table/package.json @@ -0,0 +1,38 @@ +{ + "name": "@newcar/mod-table", + "version": "1.0.0", + "description": "", + "author": "BugDuck Team", + "license": "Apache-2.0", + "exports": { + ".": { + "dev": "./src/index.ts", + "types": "./dist/index.d.ts", + "import": "./dist/index.mjs", + "require": "./dist/index.cjs" + } + }, + "types": "./dist/index.d.ts", + "files": [ + "dist" + ], + "scripts": { + "publish": "npm publish", + "build": "tsup", + "dev": "tsup --watch" + }, + "peerDependencies": { + "canvaskit-wasm": ">=0.39.1" + }, + "dependencies": { + "@newcar/basic": "workspace:*", + "@newcar/core": "workspace:*", + "@newcar/utils": "workspace:*" + }, + "devDependencies": { + "canvaskit-wasm": "0.39.1" + }, + "publishConfig": { + "access": "public" + } +} diff --git a/mods/mod-table/src/index.ts b/mods/mod-table/src/index.ts new file mode 100644 index 000000000..32a3e8356 --- /dev/null +++ b/mods/mod-table/src/index.ts @@ -0,0 +1,124 @@ +import type { Ref, WidgetOptions, WidgetStyle } from '@newcar/core' +import { Widget, ref } from '@newcar/core' +import type { Canvas, CanvasKit } from 'canvaskit-wasm' +import { Line } from '@newcar/basic' +import type { Color } from '@newcar/utils' +import { isNull } from '@newcar/utils' + +export interface TableOptions extends WidgetOptions { + style?: TableStyle +} + +export interface TableStyle extends WidgetStyle {} + +export interface TableItem { + content?: Widget | null + backgroundColor?: Color | null +} + +export type Row = Array + +export type Column = Array + +function create2DArray(row: number, col: number) { + const array = Array(row) + + for (let i = 0; i < row; i++) { + array[i] = Array(col).fill(null) + } + + return array +} + +export class Table extends Widget { + row: Ref + col: Ref + private lines: Array = [] + // The width of each column + private cols: Column = [] + // The height of each rows + private rows: Row = [] + private data: Array> + + constructor(row: number, col: number, options?: TableOptions) { + super(options ?? {}) + this.row = ref(row) + this.col = ref(col) + this.cols = Array(this.col.value).fill(100) + this.rows = Array(this.row.value).fill(45) + this.data = create2DArray(row, col) + } + + init(ck: CanvasKit) { + super.init(ck) + const totalWidth = this.calculateWidth() + const totalHeight = this.calculateHeight() + let counter = 0 + for (let x = 0; x < this.col.value; x += 1) { + // TODO + counter += this.cols[x] + this.lines.push( + new Line([counter, 0], [counter, totalHeight]), + ) + } + + counter = 0 + for (let y = 0; y < this.row.value; y += 1) { + counter += this.rows[y] + this.lines.push( + new Line([0, counter], [totalWidth, counter]), + ) + } + this.add(...this.lines) + + for (const r of this.data) { + for (const c of r) { + if (!isNull(c)) { + if (!c.initialized) { + c.initialized = true + c.init(ck) + } + // this.setItemWithRange(c, c.calculateRange()) + } + } + } + } + + draw(canvas: Canvas) { + super.draw(canvas) + for (const r of this.data) { + for (const c of r) { + if (!isNull(c)) { /* empty */ } + // this.setItemWithRange(c, c.calculateRange()) + } + } + } + + calculateHeight() { + let result = 0 + for (const height of this.rows) { + result += height + } + return result + } + + calculateWidth() { + let result = 0 + for (const width of this.cols) { + result += width + } + return result + } + + setItem(item: Widget, row: number, col: number) { + this.data[row][col] = item + + return this + } + + removeItem(row: number, col: number) { + this.data[row][col] = null + + return this + } +} diff --git a/mods/mod-table/tsup.config.ts b/mods/mod-table/tsup.config.ts new file mode 100644 index 000000000..010d3727b --- /dev/null +++ b/mods/mod-table/tsup.config.ts @@ -0,0 +1 @@ +export { default } from '../../tsup.config' diff --git a/mods/mod-table/typedoc.json b/mods/mod-table/typedoc.json new file mode 100644 index 000000000..f593f276c --- /dev/null +++ b/mods/mod-table/typedoc.json @@ -0,0 +1,4 @@ +{ + "extends": ["../../typedoc.base.json"], + "entryPoints": ["src/index.ts"] +} diff --git a/mods/mod-text-editor/src/index.ts b/mods/mod-text-editor/src/index.ts index bc2b856d6..6a2086851 100644 --- a/mods/mod-text-editor/src/index.ts +++ b/mods/mod-text-editor/src/index.ts @@ -13,7 +13,8 @@ export default class TextEditor extends Text { element: HTMLInputElement = document.createElement('input') constructor(originText: string, options?: TextEditorOptions) { - super(originText, options) + options.style ??= {} + super(originText, options ?? {}) } init(ck: CanvasKit) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f98e60f10..bba502521 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -134,6 +134,12 @@ importers: '@newcar/mod-skottie': specifier: workspace:* version: link:../mods/mod-skottie + '@newcar/mod-table': + specifier: workspace:* + version: link:../mods/mod-table + '@newcar/mod-text-editor': + specifier: workspace:* + version: link:../mods/mod-text-editor '@newcar/plugin-debug': specifier: workspace:* version: link:../plugins/plugin-debug @@ -295,6 +301,38 @@ importers: specifier: 0.39.1 version: 0.39.1 + mods/mod-table: + dependencies: + '@newcar/basic': + specifier: workspace:* + version: link:../../packages/basic + '@newcar/core': + specifier: workspace:* + version: link:../../packages/core + '@newcar/utils': + specifier: workspace:* + version: link:../../packages/utils + devDependencies: + canvaskit-wasm: + specifier: 0.39.1 + version: 0.39.1 + + mods/mod-text-editor: + dependencies: + '@newcar/basic': + specifier: workspace:* + version: link:../../packages/basic + '@newcar/core': + specifier: workspace:* + version: link:../../packages/core + '@newcar/utils': + specifier: workspace:* + version: link:../../packages/utils + devDependencies: + canvaskit-wasm: + specifier: 0.39.1 + version: 0.39.1 + packages/basic: dependencies: '@newcar/core':