Skip to content

Commit

Permalink
feat(react): support config css variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@janryWang
janryWang committed Nov 10, 2021
1 parent 8f5ee95 commit e954d86
Show file tree
Hide file tree
Showing 13 changed files with 282 additions and 644 deletions.
20 changes: 10 additions & 10 deletions formily/antd/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
},
"devDependencies": {
"@designable/react-settings-form": "1.0.0-beta.33",
"@formily/antd": "^2.0.0-rc.12",
"@formily/core": "^2.0.0-rc.12",
"@formily/react": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.12",
"@formily/shared": "^2.0.0-rc.12",
"@formily/antd": "^2.0.0-rc.19",
"@formily/core": "^2.0.0-rc.19",
"@formily/react": "^2.0.0-rc.19",
"@formily/reactive": "^2.0.0-rc.19",
"@formily/shared": "^2.0.0-rc.19",
"autoprefixer": "^9.0",
"file-loader": "^5.0.2",
"fs-extra": "^8.1.0",
Expand All @@ -47,11 +47,11 @@
"webpack-dev-server": "^3.10.1"
},
"peerDependencies": {
"@formily/antd": "^2.0.0-rc.12",
"@formily/core": "^2.0.0-rc.12",
"@formily/react": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.12",
"@formily/shared": "^2.0.0-rc.12",
"@formily/antd": "^2.0.0-rc.19",
"@formily/core": "^2.0.0-rc.19",
"@formily/react": "^2.0.0-rc.19",
"@formily/reactive": "^2.0.0-rc.19",
"@formily/shared": "^2.0.0-rc.19",
"@types/react": ">=16.8.0 || >=17.0.0",
"@types/react-dom": ">=16.8.0 || >=17.0.0",
"antd": "^4.0.0",
Expand Down
20 changes: 10 additions & 10 deletions formily/next/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
},
"devDependencies": {
"@designable/react-settings-form": "1.0.0-beta.33",
"@formily/core": "^2.0.0-rc.12",
"@formily/next": "^2.0.0-rc.12",
"@formily/react": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.12",
"@formily/shared": "^2.0.0-rc.12",
"@formily/core": "^2.0.0-rc.19",
"@formily/next": "^2.0.0-rc.19",
"@formily/react": "^2.0.0-rc.19",
"@formily/reactive": "^2.0.0-rc.19",
"@formily/shared": "^2.0.0-rc.19",
"autoprefixer": "^9.0",
"file-loader": "^5.0.2",
"fs-extra": "^8.1.0",
Expand All @@ -48,11 +48,11 @@
},
"peerDependencies": {
"@alifd/next": "^1.23.0",
"@formily/core": "^2.0.0-rc.12",
"@formily/next": "^2.0.0-rc.12",
"@formily/react": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.12",
"@formily/shared": "^2.0.0-rc.12",
"@formily/core": "^2.0.0-rc.19",
"@formily/next": "^2.0.0-rc.19",
"@formily/react": "^2.0.0-rc.19",
"@formily/reactive": "^2.0.0-rc.19",
"@formily/shared": "^2.0.0-rc.19",
"@types/react": ">=16.8.0 || >=17.0.0",
"@types/react-dom": ">=16.8.0 || >=17.0.0",
"antd": "^4.0.0",
Expand Down
16 changes: 8 additions & 8 deletions formily/setters/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
"start": "webpack-dev-server --config playground/webpack.dev.ts"
},
"devDependencies": {
"@formily/antd": "^2.0.0-rc.12",
"@formily/core": "^2.0.0-rc.12",
"@formily/react": "^2.0.0-rc.12",
"@formily/shared": "^2.0.0-rc.12",
"@formily/antd": "^2.0.0-rc.19",
"@formily/core": "^2.0.0-rc.19",
"@formily/react": "^2.0.0-rc.19",
"@formily/shared": "^2.0.0-rc.19",
"antd": "^4.0.0"
},
"peerDependencies": {
"@formily/antd": "^2.0.0-rc.12",
"@formily/core": "^2.0.0-rc.12",
"@formily/react": "^2.0.0-rc.12",
"@formily/shared": "^2.0.0-rc.12",
"@formily/antd": "^2.0.0-rc.19",
"@formily/core": "^2.0.0-rc.19",
"@formily/react": "^2.0.0-rc.19",
"@formily/shared": "^2.0.0-rc.19",
"@types/react": ">=16.8.0 || >=17.0.0",
"@types/react-dom": ">=16.8.0 || >=17.0.0",
"antd": "^4.0.0",
Expand Down
8 changes: 4 additions & 4 deletions formily/transformer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"access": "public"
},
"devDependencies": {
"@formily/core": "^2.0.0-rc.12",
"@formily/json-schema": "^2.0.0-rc.12"
"@formily/core": "^2.0.0-rc.19",
"@formily/json-schema": "^2.0.0-rc.19"
},
"peerDependencies": {
"@formily/core": "^2.0.0-rc.12",
"@formily/json-schema": "^2.0.0-rc.12"
"@formily/core": "^2.0.0-rc.19",
"@formily/json-schema": "^2.0.0-rc.19"
},
"dependencies": {
"@designable/core": "1.0.0-beta.33",
Expand Down
12 changes: 6 additions & 6 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
"build:umd": "rollup --config"
},
"devDependencies": {
"@formily/json-schema": "^2.0.0-rc.12",
"@formily/path": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.12"
"@formily/json-schema": "^2.0.0-rc.19",
"@formily/path": "^2.0.0-rc.19",
"@formily/reactive": "^2.0.0-rc.19"
},
"peerDependencies": {
"@formily/json-schema": "^2.0.0-rc.12",
"@formily/path": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.12"
"@formily/json-schema": "^2.0.0-rc.19",
"@formily/path": "^2.0.0-rc.19",
"@formily/reactive": "^2.0.0-rc.19"
},
"dependencies": {
"@designable/shared": "1.0.0-beta.33",
Expand Down
4 changes: 2 additions & 2 deletions packages/playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"@designable/react-sandbox": "1.0.0-beta.33",
"@designable/react-settings-form": "1.0.0-beta.33",
"@designable/shared": "1.0.0-beta.33",
"@formily/reactive": "^2.0.0-rc.12",
"@formily/reactive-react": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.19",
"@formily/reactive-react": "^2.0.0-rc.19",
"antd": "^4.15.2",
"react": "^16.8.x",
"react-dom": "^16.8.x",
Expand Down
24 changes: 12 additions & 12 deletions packages/react-settings-form/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
"build:umd": "rollup --config"
},
"peerDependencies": {
"@formily/antd": "^2.0.0-rc.12",
"@formily/core": "^2.0.0-rc.12",
"@formily/react": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.12",
"@formily/reactive-react": "^2.0.0-rc.12",
"@formily/shared": "^2.0.0-rc.12",
"@formily/antd": "^2.0.0-rc.19",
"@formily/core": "^2.0.0-rc.19",
"@formily/react": "^2.0.0-rc.19",
"@formily/reactive": "^2.0.0-rc.19",
"@formily/reactive-react": "^2.0.0-rc.19",
"@formily/shared": "^2.0.0-rc.19",
"antd": "^4.0.0"
},
"devDependencies": {
"@formily/antd": "^2.0.0-rc.12",
"@formily/core": "^2.0.0-rc.12",
"@formily/react": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.12",
"@formily/reactive-react": "^2.0.0-rc.12",
"@formily/shared": "^2.0.0-rc.12",
"@formily/antd": "^2.0.0-rc.19",
"@formily/core": "^2.0.0-rc.19",
"@formily/react": "^2.0.0-rc.19",
"@formily/reactive": "^2.0.0-rc.19",
"@formily/reactive-react": "^2.0.0-rc.19",
"@formily/shared": "^2.0.0-rc.19",
"antd": "^4.15.5"
},
"dependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"build:umd": "rollup --config"
},
"devDependencies": {
"@formily/reactive": "^2.0.0-rc.12",
"@formily/reactive-react": "^2.0.0-rc.12"
"@formily/reactive": "^2.0.0-rc.19",
"@formily/reactive-react": "^2.0.0-rc.19"
},
"peerDependencies": {
"@formily/reactive": "^2.0.0-rc.12",
"@formily/reactive-react": "^2.0.0-rc.12",
"@formily/reactive": "^2.0.0-rc.19",
"@formily/reactive-react": "^2.0.0-rc.19",
"antd": "^4.15.4",
"react": "16.x || 17.x"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/containers/Designer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const Designer: React.FC<IDesignerProps> = (props) => {
)

return (
<Layout theme={props.theme} prefixCls={props.prefixCls}>
<Layout {...props}>
<DesignerEngineContext.Provider value={props.engine}>
{props.children}
<GhostWidget />
Expand Down
14 changes: 13 additions & 1 deletion packages/react/src/containers/Layout.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
import React, { useContext, Fragment } from 'react'
import React, { useContext, Fragment, useRef, useLayoutEffect } from 'react'
import { each } from '@designable/shared'
import { DesignerLayoutContext } from '../context'
import { IDesignerLayoutProps } from '../types'
import cls from 'classnames'

export const Layout: React.FC<IDesignerLayoutProps> = (props) => {
const layout = useContext(DesignerLayoutContext)
const ref = useRef<HTMLDivElement>()

useLayoutEffect(() => {
if (ref.current) {
each(props.variables, (value, key) => {
ref.current.style.setProperty(`--${key}`, value)
})
}
}, [])

if (layout) {
return <Fragment>{props.children}</Fragment>
}
return (
<div
ref={ref}
className={cls({
[`${props.prefixCls}app`]: true,
[`${props.prefixCls}${props.theme}`]: props.theme,
Expand Down
Loading

0 comments on commit e954d86

Please sign in to comment.