Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TablePlugin] Table cells merging POC #2590

Closed
wants to merge 98 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
29c6ea7
[SlateEditor] implement merge and unmerge
dimaanj Aug 24, 2023
79c3548
[TablePlugin] fix resize
dimaanj Aug 25, 2023
2f33bf0
[TablePlugin] fix pasting table from word and other sites
dimaanj Aug 25, 2023
278bfd1
[TablePlugin] add comment
dimaanj Aug 25, 2023
b9b8bdb
[TablePlugin] change icon for unmerge button
dimaanj Aug 25, 2023
00197fc
[TablePlugin] fix bug in ff
dimaanj Aug 28, 2023
831b583
Merge branch 'main' of https://github.com/udecode/plate into table-ce…
dimaanj Aug 29, 2023
c06db8c
[TablePlugin] fix lint problems
dimaanj Aug 29, 2023
32c75d4
[TablePlugin] fix types and tests
dimaanj Aug 30, 2023
f56a9ec
[TablePlugin] fix serialisation tests for table element
dimaanj Aug 30, 2023
da2fb2a
Merge branch 'main' of https://github.com/udecode/plate into table-ce…
dimaanj Sep 5, 2023
ecf14a8
[TablePlugin] fix some issues
dimaanj Sep 6, 2023
5a79d1b
[TablePlugin] implement handy selection, make merge and unmerge stable
dimaanj Sep 8, 2023
d777438
[TablePlugin] implement column / row adding / removal functions with …
dimaanj Sep 15, 2023
7cc1c84
[SlateEditor] remove logs
dimaanj Sep 15, 2023
0ce531b
Merge branch 'main' of https://github.com/udecode/plate into table-ce…
dimaanj Sep 19, 2023
595e4f1
[SlateEditor] do not push empty cells to merged cell
dimaanj Sep 19, 2023
b07eae0
[TablePlugin] fix some tests
dimaanj Sep 21, 2023
9ef9bd7
[TablePlugin] update remaining tests
dimaanj Sep 22, 2023
884cea7
[TablePlugin] remove logs
dimaanj Sep 22, 2023
b3139e2
Sep 20, 2023
c4afaac
Create twelve-cars-drop.md
zbeyens Sep 20, 2023
bc36980
Version Packages
github-actions[bot] Sep 20, 2023
fe92705
🐛
Sep 22, 2023
404f68c
🐛
Sep 27, 2023
99c06a5
Version Packages
github-actions[bot] Sep 27, 2023
6ecb6b4
Oct 3, 2023
5c67d2d
added changeset
shahriar-shojib Sep 28, 2023
0e68057
removed unnecessary tsup options
shahriar-shojib Sep 28, 2023
f1618b7
[test] don't use turbo cache on ci
shahriar-shojib Sep 28, 2023
e290287
[test] allow manual workflow runs
shahriar-shojib Sep 28, 2023
0eceab8
[test] update concurrency on test
shahriar-shojib Sep 28, 2023
dbd4e3d
[test] adjust jest concurrency
shahriar-shojib Sep 28, 2023
9da200b
adjust concurrency for test
shahriar-shojib Sep 29, 2023
2083870
test vercel deployment
shahriar-shojib Sep 29, 2023
f06549c
rename package json rollup script to watch
shahriar-shojib Sep 29, 2023
c4c910f
🔀
Oct 3, 2023
6defaf2
fix ts issues
shahriar-shojib Sep 29, 2023
754ec75
🧪 fix import paths
Sep 29, 2023
6017705
fix: is-hotkey imports
shahriar-shojib Sep 29, 2023
2fef077
added custom script for global package watching
shahriar-shojib Sep 29, 2023
48cd17e
remove unused variables
shahriar-shojib Sep 29, 2023
4fa6687
use turbo to build affected packages by watch
shahriar-shojib Sep 29, 2023
0c1291b
fix tests
shahriar-shojib Sep 30, 2023
46fa13a
update p:build:watch script
shahriar-shojib Sep 30, 2023
8eff5ed
cleanup watcher script
shahriar-shojib Sep 30, 2023
d6b7ec0
Sep 30, 2023
57e97b6
fix dev script
shahriar-shojib Sep 30, 2023
2f0e211
added turbowatch
shahriar-shojib Sep 30, 2023
8e19b6b
🔀
Oct 3, 2023
e15eef2
package json sorting
shahriar-shojib Sep 30, 2023
528bdb4
revert <AnyObject> changes
shahriar-shojib Sep 30, 2023
30f7343
Version Packages
github-actions[bot] Sep 30, 2023
c0933d2
remove unnecessary exports
shahriar-shojib Sep 30, 2023
ad21ebe
updated lockfile
shahriar-shojib Sep 30, 2023
516698d
📝
Sep 30, 2023
9d3b5de
Version Packages
github-actions[bot] Sep 30, 2023
952b3d5
⬆️
Sep 30, 2023
f41011f
👷
Sep 30, 2023
a05cdb1
👷
Sep 30, 2023
5263fc5
👷
Sep 30, 2023
b941c9e
👷
Oct 1, 2023
c43e1bc
📌
Oct 1, 2023
08b7c71
Version Packages
github-actions[bot] Oct 1, 2023
a2feb44
👷
Oct 1, 2023
e06d6db
👷
Oct 1, 2023
f297675
fix lodash imports
shahriar-shojib Oct 1, 2023
b2cd2df
👷
Oct 1, 2023
ee5fb34
👷
Oct 1, 2023
231c900
👷
Oct 2, 2023
5eae198
👷
Oct 2, 2023
388cbc3
🚚
Oct 2, 2023
69528ed
👷
Oct 2, 2023
7195c20
👷
Oct 2, 2023
442a1d7
👷
Oct 2, 2023
a97818f
Version Packages
github-actions[bot] Oct 2, 2023
27fb3e5
fix: types
Oct 2, 2023
10ca9ec
fix: types
Oct 2, 2023
1673de5
fix: types
Oct 2, 2023
a0abaf4
Version Packages
github-actions[bot] Oct 2, 2023
99f0e34
Disable tabbable when editor is read-only
12joan Oct 2, 2023
87123cb
fix tsup bundling local package imported types
shahriar-shojib Oct 2, 2023
8cbe9e4
fix
Oct 2, 2023
ad49770
fix
Oct 2, 2023
2151721
revert AnyObject change
shahriar-shojib Oct 2, 2023
f354d8e
fix
Oct 2, 2023
4b70552
💚
Oct 2, 2023
53a3a5c
Version Packages
github-actions[bot] Oct 2, 2023
f54d754
Oct 2, 2023
2198a39
Oct 2, 2023
dec8144
Oct 2, 2023
ccf7219
👷
Oct 2, 2023
6989eb5
Version Packages
github-actions[bot] Oct 2, 2023
d570fbf
👷
Oct 3, 2023
f3e9ad8
👷
Oct 3, 2023
ba682a7
Create four-hornets-decide.md
zbeyens Oct 3, 2023
3675924
Version Packages
github-actions[bot] Oct 3, 2023
06315fd
👷
Oct 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
78 changes: 0 additions & 78 deletions .github/ci-templates.yml

This file was deleted.

67 changes: 67 additions & 0 deletions .github/workflows/ci-templates.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Build Templates

on:
push:
branches:
- main
paths:
- 'templates/**'
pull_request:
types:
- opened
- synchronize
- reopened
paths:
- 'templates/**'

jobs:
build:
name: build
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
template:
- plate-template
- plate-playground-template
defaults:
run:
working-directory: templates/${{ matrix.template }}
steps:
- name: Checkout Repo
uses: actions/checkout@v3
with:
# Fetch all git history so that yarn workspaces --since can compare with the correct commits
# @link https://github.com/actions/checkout#fetch-all-history-for-all-tags-and-branches
fetch-depth: 0

- uses: pnpm/[email protected]
name: Install pnpm
with:
version: 8.6.1
run_install: false

- name: Use Node.js 16
uses: actions/setup-node@v3
with:
node-version: 16
cache: "pnpm"
cache-dependency-path: '**/pnpm-lock.yaml' # THIS PATTERN did the trick for me.

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-

- name: Install dependencies
run: pnpm install

- name: Build
run: pnpm build
2 changes: 1 addition & 1 deletion .github/workflows/registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
yarn-cache-folder-

- name: Install
run: yarn install
run: YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install

- name: Build Registry
run: yarn build:registry
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ jobs:
yarn-cache-folder-

- name: Install Dependencies
# run: yarn install --immutable
run: YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install

- name: Prepare Release
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ on:
- 'scripts'
- 'patches'

workflow_dispatch:

jobs:
test:
name: ${{ matrix.command }}
Expand Down Expand Up @@ -98,7 +100,7 @@ jobs:
needs:
- test
if: ${{ github.event_name == 'push' && failure() }}

steps:
- name: Notify
uses: nobrayner/discord-webhook@v1
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,5 @@ packages/plate/docs/
/test-results/
/playwright-report/
/playwright/.cache/
.turbo
.turbo
.vercel
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This document will provide guidance to help streamline the process and make effi
This repository is a monorepo.

- We use [yarn](https://yarnpkg.com/en/docs/install) and [`workspaces`](https://yarnpkg.com/features/workspaces) for development.
- We use [Rollup](https://rollupjs.org/) as our build system.
- We use [tsup](https://tsup.egoist.dev/) as our build system.
- We use [changesets](https://github.com/changesets/changesets) for managing releases.

## Structure
Expand All @@ -32,7 +32,7 @@ packages
```

| Path | Description |
|---------------------------|------------------------------------------|
| ------------------------- | ---------------------------------------- |
| `apps/www/content` | The content for the website. |
| `apps/www/src/app` | The Next.js application for the website. |
| `apps/www/src/components` | The React components for the website. |
Expand Down Expand Up @@ -265,4 +265,4 @@ After creating your package, install and build it:
```bash
yarn install
yarn build
```
```
1 change: 1 addition & 0 deletions apps/e2e-examples/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const router = createBrowserRouter([

const rootElement = document.querySelector('#root');

// eslint-disable-next-line react/no-deprecated
ReactDOM.render(
<React.StrictMode>
<RouterProvider router={router} />
Expand Down
1 change: 1 addition & 0 deletions apps/www/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.next
.contentlayer
tsconfig.tsbuildinfo
2 changes: 1 addition & 1 deletion apps/www/content/docs/api/core.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Generates a new instance of a `PlateEditor`, initialized with a set of plugins a
<APIItem name="editor" type="TEditor<V>" optional>
Initial editor without `withPlate`.
</APIItem>
<APIItem name="plugins" type="PlatePlugin<PluginOptions, V>[]" optional>
<APIItem name="plugins" type="PlatePlugin[]" optional>
An array of editor plugins.
</APIItem>
<APIItem
Expand Down
3 changes: 2 additions & 1 deletion apps/www/content/docs/components/cli.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ npx @udecode/plate-ui@latest add [component]
You will be presented with a list of components to choose from:

```txt
Which components would you like to add? › Space to select. Return to submit.
Which components would you like to add? › Space to select. A to toggle all.
Enter to submit.

◯ align-dropdown-menu
◯ avatar
Expand Down
7 changes: 6 additions & 1 deletion apps/www/content/docs/components/dark-mode/next.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ export default function RootLayout({ children }: RootLayoutProps) {
<html lang="en" suppressHydrationWarning>
<head />
<body>
<ThemeProvider attribute="class" defaultTheme="system" enableSystem>
<ThemeProvider
attribute="class"
defaultTheme="system"
enableSystem
disableTransitionOnChange
>
{children}
</ThemeProvider>
</body>
Expand Down
Loading