Skip to content

Commit

Permalink
Merge branch 'main' into fix/frame-src-types
Browse files Browse the repository at this point in the history
Fixed conflicts
  • Loading branch information
srares76 committed Jan 2, 2023
2 parents 9e9c479 + 0914439 commit 2fef225
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# editor-sdk

![Coverage](https://img.shields.io/badge/coverage-95.52%25-brightgreen.svg)
![Coverage](https://img.shields.io/badge/coverage-95.48%25-brightgreen.svg)

[![Build PR](https://github.com/chili-publish/editor-sdk/actions/workflows/pr-build.yml/badge.svg)](https://github.com/chili-publish/editor-sdk/actions/workflows/pr-build.yml) [![Publish Package](https://github.com/chili-publish/editor-sdk/actions/workflows/publish-package.yml/badge.svg)](https://github.com/chili-publish/editor-sdk/actions/workflows/publish-package.yml)

Expand Down
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export {
FlowDirection,
FitMode,
UpdateZIndexMethod,
ImageSourceTypeEnum
} from '../types/FrameTypes';
export { VariableType, ImageVariableSourceType } from '../types/VariableTypes';

Expand Down
9 changes: 5 additions & 4 deletions types/FrameTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,19 @@ export type FrameType = {
};

export type Frame = TextFrame | ImageFrame;

export type ImageUrlVariableSource = {
sourceType: ImageSourceType.urlVariable;
sourceType: ImageSourceTypeEnum.urlVariable;
variableId: string;
}
export type ImageUrlSource = {
sourceType: ImageSourceType.url;
sourceType: ImageSourceTypeEnum.url;
url: string;
}
export type ImageConnectorVariableSource = {
assetId: string;
connectorId: string;
sourceType: ImageSourceType.connectorVariable;
sourceType: ImageSourceTypeEnum.connectorVariable;
url: string;
}
// used by new getter methods
Expand Down Expand Up @@ -72,7 +73,7 @@ export type TextFrame = {
blendMode: BlendMode;
};

export enum ImageSourceType {
export enum ImageSourceTypeEnum {
url = 'url',
urlVariable = 'urlVariable',
connectorVariable = 'connectorVariable',
Expand Down

0 comments on commit 2fef225

Please sign in to comment.