-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2145 from umbraco/v14/bugfix/crops-with-label-and…
…-valid Bugfix: Crops do not show their label and invalid crops are rendered
- Loading branch information
Showing
11 changed files
with
59 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 4 additions & 12 deletions
16
src/packages/media/media/components/input-image-cropper/types.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/packages/media/media/modals/image-cropper-editor/image-cropper-editor-modal.token.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 0 additions & 32 deletions
32
src/packages/media/media/property-editors/media-picker/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1 @@ | ||
export * from './property-editor-ui-media-picker.element.js'; | ||
|
||
export type UmbMediaPickerPropertyValue = { | ||
key: string; | ||
mediaKey: string; | ||
mediaTypeAlias: string; | ||
focalPoint: UmbFocalPointModel | null; | ||
crops: Array<UmbCropModel>; | ||
}; | ||
|
||
export type UmbCropModel = { | ||
alias: string; | ||
height: number; | ||
width: number; | ||
coordinates?: { | ||
x1: number; | ||
x2: number; | ||
y1: number; | ||
y2: number; | ||
}; | ||
}; | ||
|
||
export interface UmbConfiguredCropModel { | ||
label: string; | ||
alias: string; | ||
width: number; | ||
height: number; | ||
} | ||
|
||
export interface UmbFocalPointModel { | ||
left: number; | ||
top: number; | ||
} |
2 changes: 1 addition & 1 deletion
2
...ages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
export type UmbMediaPickerPropertyValue = { | ||
key: string; | ||
mediaKey: string; | ||
mediaTypeAlias: string; | ||
focalPoint: UmbFocalPointModel | null; | ||
crops: Array<UmbCropModel>; | ||
}; | ||
|
||
export type UmbCropModel = { | ||
label?: string; | ||
alias: string; | ||
height: number; | ||
width: number; | ||
coordinates?: { | ||
x1: number; | ||
x2: number; | ||
y1: number; | ||
y2: number; | ||
}; | ||
}; | ||
|
||
export interface UmbFocalPointModel { | ||
left: number; | ||
top: number; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters