Skip to content

Commit

Permalink
Improve symbol api (#446)
Browse files Browse the repository at this point in the history
Improve symbol api
  • Loading branch information
mathieudutour authored Nov 19, 2019
2 parents ae15886 + 1f5c6bb commit bb8465a
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 8 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

This project adheres to [Semantic Versioning](http://semver.org/). Every release, along with the migration instructions, is documented on the Github [Releases](https://github.com/airbnb/react-sketchapp/releases) page.

## Version 3.0.1

- Allow passing a style object when making a symbol
- Expose `getSymbolMasterByName`

## Version 3.0.0

- Export Svg components in the Svg/index.js file (Thanks @saschazar21!)
Expand Down
12 changes: 9 additions & 3 deletions docs/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ Reset the registered styles.

An interface to Sketch's symbols. Create symbols and optionally inject them into the symbols page.

### `makeSymbol(node, name, document)`
### `makeSymbol(node, props, document)`

Creates a new symbol and injects it into the `Symbols` page. The name of the symbol can be optionally provided and will default to the display name of the component.

Expand All @@ -636,12 +636,18 @@ Returns a react component which is an can be used to render instances of the sym
| Parameter | Type | Default | Note |
| --- | --- | --- | --- |
| `node` | `Node` | | The node object that will be rendered as a symbol |
| `name` | `String` | The node name | Optional name for the symbol, string can include backslashes to organize these symbols with Sketch. For example `squares/blue` |
| `props` | `Object` | The node name | Optional name for the symbol, string can include backslashes to organize these symbols with Sketch. For example `squares/blue` |
| `props.name` | `String` | The node name | Optional name for the symbol, string can include backslashes to organize these symbols with Sketch. For example `squares/blue` |
| `props.style` | [`Style`](/docs/styling.md) | | |
| `document` | `Object` | The current document | The Sketch document to make the symbol in |

### `getSymbolComponentByName(name)`

Returns a react component which can be used to render the symbol that is associated with that name.
Returns a react component which can be used to render the symbol instance that is associated with that name.

### `getSymbolMasterByName(name)`

Returns the JSON representation of the symbol master that is associated with that name.

### Symbol example

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-sketchapp",
"version": "3.0.0",
"version": "3.0.1",
"description": "A React renderer for Sketch.app",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
3 changes: 3 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import _TextStyles from './sharedStyles/TextStyles';
import {
makeSymbol as _makeSymbol,
getSymbolComponentByName as _getSymbolComponentByName,
getSymbolMasterByName as _getSymbolMasterByName,
injectSymbols as _injectSymbols,
} from './symbol';

Expand All @@ -31,6 +32,7 @@ export const View = _View;
export const Platform = _Platform;
export const makeSymbol = _makeSymbol;
export const getSymbolComponentByName = _getSymbolComponentByName;
export const getSymbolMasterByName = _getSymbolMasterByName;
export const injectSymbols = _injectSymbols;

export default {
Expand All @@ -49,5 +51,6 @@ export default {
Platform,
makeSymbol,
getSymbolComponentByName,
getSymbolMasterByName,
injectSymbols,
};
3 changes: 2 additions & 1 deletion src/renderers/SymbolMasterRenderer.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { makeSymbolMaster, makeRect } from '../jsonUtils/models';
import SketchRenderer from './SketchRenderer';
import { TreeNode } from '../types';
import { SymbolMasterProps } from '../symbol';

export default class SymbolMasterRenderer extends SketchRenderer {
renderGroupLayer({ layout, props }: TreeNode<{ symbolID: string; name: string }>) {
renderGroupLayer({ layout, props }: TreeNode<SymbolMasterProps & { symbolID: string }>) {
return makeSymbolMaster(
makeRect(layout.left, layout.top, layout.width, layout.height),
props.symbolID,
Expand Down
19 changes: 16 additions & 3 deletions src/symbol.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,24 +143,37 @@ export const createSymbolInstanceClass = (symbolMaster: FileFormat.SymbolMaster)
};
};

const SymbolMasterPropTypes = {
style: PropTypes.shape(ViewStylePropTypes),
name: PropTypes.string,
};

export type SymbolMasterProps = PropTypes.InferProps<typeof SymbolMasterPropTypes>;

export const makeSymbol = (
Component: React.ComponentType<any>,
name: string,
symbolProps: string | SymbolMasterProps,
document?: SketchDocumentData | SketchDocument | WrappedSketchDocument,
) => {
if (!hasInitialized && getSketchVersion() !== 'NodeJS') {
getExistingSymbols(getDocumentData(document));
}

const masterName = name || displayName(Component);
const masterName =
(typeof symbolProps === 'string' ? symbolProps : (symbolProps || {}).name) ||
displayName(Component);
const existingSymbol = existingSymbols.find(symbolMaster => symbolMaster.name === masterName);
const symbolID = existingSymbol
? existingSymbol.symbolID
: generateID(`symbolID:${masterName}`, !!name);

const symbolMaster = flexToSketchJSON(
buildTree(
<sketch_symbolmaster symbolID={symbolID} name={masterName}>
<sketch_symbolmaster
{...(typeof symbolProps !== 'string' ? symbolProps || {} : {})}
symbolID={symbolID}
name={masterName}
>
<Component />
</sketch_symbolmaster>,
),
Expand Down

0 comments on commit bb8465a

Please sign in to comment.