Skip to content

Commit

Permalink
Merge branch 'trunk' into rnmobile/update-reanimated-2.9.1-wp-3
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/react-native-editor/CHANGELOG.md
  • Loading branch information
Gerardo committed Feb 1, 2023
2 parents 431098b + 76f8b5f commit cb831f7
Show file tree
Hide file tree
Showing 429 changed files with 3,046 additions and 2,149 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const restrictedImports = [
'toString',
'trim',
'truncate',
'unescape',
'unionBy',
'uniq',
'uniqBy',
Expand Down
23 changes: 15 additions & 8 deletions bin/log-perormance-results.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
const fs = require( 'fs' );
const path = require( 'path' );
const https = require( 'https' );
const { mapKeys } = require( 'lodash' );
const [ token, branch, hash, baseHash, timestamp ] = process.argv.slice( 2 );

const resultsFiles = [
Expand Down Expand Up @@ -39,19 +38,27 @@ const data = new TextEncoder().encode(
metrics: resultsFiles.reduce( ( result, { metricsPrefix }, index ) => {
return {
...result,
...mapKeys(
performanceResults[ index ][ hash ],
( _, key ) => metricsPrefix + key
...Object.fromEntries(
Object.entries(
performanceResults[ index ][ hash ] ?? {}
).map( ( [ key, value ] ) => [
metricsPrefix + key,
value,
] )
),
};
}, {} ),
} ),
baseMetrics: resultsFiles.reduce(
( result, { metricsPrefix }, index ) => {
return {
...result,
...mapKeys(
performanceResults[ index ][ baseHash ],
( _, key ) => metricsPrefix + key
...Object.fromEntries(
Object.entries(
performanceResults[ index ][ baseHash ] ?? {}
).map( ( [ key, value ] ) => [
metricsPrefix + key,
value,
] )
),
};
},
Expand Down
333 changes: 333 additions & 0 deletions changelog.txt

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions docs/how-to-guides/themes/theme-json.md
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@ The settings section has the following structure:
"text": true
},
"custom": {},
"dimensions": {
"minHeight": false,
},
"layout": {
"contentSize": "800px",
"wideSize": "1000px"
Expand Down Expand Up @@ -317,6 +320,7 @@ There's one special setting property, `appearanceTools`, which is a boolean and

- border: color, radius, style, width
- color: link
- dimensions: minHeight
- spacing: blockGap, margin, padding
- typography: lineHeight

Expand Down Expand Up @@ -355,10 +359,10 @@ The following presets can be defined via `theme.json`:
- `steps`: the number of steps to generate in the spacing scale. The default is 7. To prevent the generation of the spacing presets, and to disable the related UI, this can be set to `0`.
- `mediumStep`: the steps in the scale are generated descending and ascending from a medium step, so this should be the size value of the medium space, without the unit. The default medium step is `1.5rem` so the mediumStep value is `1.5`.
- `unit`: the unit the scale uses, eg. `px, rem, em, %`. The default is `rem`.
- `spacing.spacingSizes`: themes can choose to include a static `spacing.spacingSizes` array of spacing preset sizes if they have a sequence of sizes that can't be generated via an increment or mulitplier.
- `spacing.spacingSizes`: themes can choose to include a static `spacing.spacingSizes` array of spacing preset sizes if they have a sequence of sizes that can't be generated via an increment or multiplier.
- `name`: a human readable name for the size, eg. `Small, Medium, Large`.
- `slug`: the machine readable name. In order to provide the best cross site/theme compatibility the slugs should be in the format, "10","20","30","40","50","60", with "50" representing the `Medium` size value.
- `size`: the size, including the unit, eg. `1.5rem`. It is possible to include fluid values like `clamp(2rem, 10vw, 20rem)`.
- `size`: the size, including the unit, eg. `1.5rem`. It is possible to include fluid values like `clamp(2rem, 10vw, 20rem)`.
- `typography.fontSizes`: generates a single class and custom property per preset value.
- `typography.fontFamilies`: generates a single custom property per preset value.

Expand Down Expand Up @@ -792,6 +796,9 @@ Each block declares which style properties it exposes via the [block supports me
"gradient": "value",
"text": "value"
},
"dimensions": {
"minHeight": "value"
},
"filter": {
"duotone": "value"
},
Expand Down Expand Up @@ -841,6 +848,7 @@ Each block declares which style properties it exposes via the [block supports me
"core/group": {
"border": {},
"color": {},
"dimensions": {},
"spacing": {},
"typography": {},
"elements": {
Expand Down
2 changes: 1 addition & 1 deletion docs/reference-guides/block-api/block-supports.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function render_block() {
- Type: `boolean`
- Default value: `false`

Anchors let you link directly to a specific block on a page. This property adds a field to define an id for the block and a button to copy the direct link. _Important: It doesn't work with dynamic blocks yet._
Anchors let you link directly to a specific block on a page. This property adds a field to define an id for the block and a button to copy the direct link.

```js
// Declare support for anchor links.
Expand Down
Loading

0 comments on commit cb831f7

Please sign in to comment.