Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 6b191f4

Browse files
peterpeterparkerpeterpeterparker
committed
merge: from master
2 parents 1bea2c2 + ed2906f commit 6b191f4

File tree

28 files changed

+224
-52
lines changed

28 files changed

+224
-52
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
- core: v8.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md))
1313
- highlight-code: v2.3.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md))
1414

15+
### Web Components: Templates
16+
17+
- slide-content: v2.3.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/slides/content/CHANGELOG.md))
18+
1519
### Others
1620

1721
- cli: v2.1.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/cli/CHANGELOG.md))

‎docs/docs/slides/app-slide-content/app-slide-content.md‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,15 @@ This component offers the following options which could be set using attributes:
117117

118118
The following theming options will affect this component if set on its host or parent.
119119

120-
| CSS4 variable | Default | Note |
121-
| ---------------------- | ------- | ------------------------------- |
122-
| --background | | |
123-
| --color | | |
124-
| --slide-padding-top | 16px | Padding top of the all slide |
125-
| --slide-padding-end | 32px | Padding right of the all slide |
126-
| --slide-padding-bottom | 16px | Padding bottom of the all slide |
127-
| --slide-padding-start | 32px | Padding left of the all slide |
128-
| --zIndex | 1 | The z-index of the slide |
120+
| CSS4 variable | Default | Note |
121+
| ------------------------------- | ---------- | -------------------------------- |
122+
| --background | | |
123+
| --color | | |
124+
| --slide-padding-top | 16px | Padding top of the all slide |
125+
| --slide-padding-end | 32px | Padding right of the all slide |
126+
| --slide-padding-bottom | 16px | Padding bottom of the all slide |
127+
| --slide-padding-start | 32px | Padding left of the all slide |
128+
| --slide-content-justify-content | flex-start | Justify the content of the slide |
129+
| --zIndex | 1 | The z-index of the slide |
129130

130131
[deckdeckgo]: https://deckdeckgo.com

‎docs/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@deckdeckgo/slide-big-img": "^2.2.2",
3333
"@deckdeckgo/slide-chart": "^2.2.2",
3434
"@deckdeckgo/slide-code": "^3.1.2",
35-
"@deckdeckgo/slide-content": "^2.2.2",
35+
"@deckdeckgo/slide-content": "^2.3.0",
3636
"@deckdeckgo/slide-countdown": "^2.2.2",
3737
"@deckdeckgo/slide-gif": "^3.2.2",
3838
"@deckdeckgo/slide-playground": "^2.2.2",

‎docs/src/app/pages/docs/slides/app-slide-content/app-slide-content.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,11 @@ export class AppConcept {
217217
<td>32px</td>
218218
<td>Padding left of the all slide</td>
219219
</tr>
220+
<tr>
221+
<td>--slide-content-justify-content</td>
222+
<td>flex-start</td>
223+
<td>Justify the content of the slide</td>
224+
</tr>
220225
<tr>
221226
<td>--zIndex</td>
222227
<td>1</td>

‎remote/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎remote/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@deckdeckgo/slide-big-img": "^2.2.2",
3333
"@deckdeckgo/slide-chart": "^2.2.2",
3434
"@deckdeckgo/slide-code": "^3.1.2",
35-
"@deckdeckgo/slide-content": "^2.2.2",
35+
"@deckdeckgo/slide-content": "^2.3.0",
3636
"@deckdeckgo/slide-countdown": "^2.2.2",
3737
"@deckdeckgo/slide-gif": "^3.2.2",
3838
"@deckdeckgo/slide-playground": "^2.2.2",

‎studio/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎studio/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@deckdeckgo/slide-aspect-ratio": "^3.2.2",
3636
"@deckdeckgo/slide-author": "^2.2.2",
3737
"@deckdeckgo/slide-chart": "^2.2.2",
38-
"@deckdeckgo/slide-content": "^2.2.2",
38+
"@deckdeckgo/slide-content": "^2.3.0",
3939
"@deckdeckgo/slide-gif": "^3.2.2",
4040
"@deckdeckgo/slide-playground": "^2.2.2",
4141
"@deckdeckgo/slide-poll": "^2.2.3",

‎studio/src/app/components/editor/actions/element/app-actions-element/app-actions-element.tsx‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,19 @@ export class AppActionsElement {
264264
});
265265
}
266266

267+
private async openCopyStyle($event: UIEvent) {
268+
const popover: HTMLIonPopoverElement = await popoverController.create({
269+
component: 'app-copy-style',
270+
componentProps: {
271+
selectedElement: this.selectedElement.element,
272+
},
273+
mode: 'ios',
274+
event: $event,
275+
});
276+
277+
await popover.present();
278+
}
279+
267280
private async clone() {
268281
if (this.selectedElement?.slot?.shape !== undefined) {
269282
await this.cloneShape();
@@ -853,8 +866,9 @@ export class AppActionsElement {
853866
component: 'app-more-element-actions',
854867
componentProps: {
855868
notes: this.selectedElement?.type === 'slide',
856-
copy: this.selectedElement?.type === 'slide' || this.selectedElement?.slot?.shape !== undefined,
869+
clone: this.selectedElement?.type === 'slide' || this.selectedElement?.slot?.shape !== undefined,
857870
images: this.selectedElement?.slide?.aspectRatio,
871+
transform: this.selectedElement?.type === 'element',
858872
},
859873
event: $event,
860874
mode: 'ios',
@@ -864,12 +878,14 @@ export class AppActionsElement {
864878
if (detail && detail.data) {
865879
if (detail.data.action === MoreAction.NOTES) {
866880
await this.openNotes();
867-
} else if (detail.data.action === MoreAction.COPY) {
881+
} else if (detail.data.action === MoreAction.CLONE) {
868882
await this.clone();
869883
} else if (detail.data.action === MoreAction.DELETE) {
870884
await this.confirmDeleteElement($event);
871885
} else if (detail.data.action === MoreAction.IMAGES) {
872886
await this.openShape('app-image-element');
887+
} else if (detail.data.action === MoreAction.TRANSFORM) {
888+
await this.openTransform();
873889
}
874890
}
875891
});
@@ -882,17 +898,18 @@ export class AppActionsElement {
882898
<aside>
883899
<ion-buttons slot="start">
884900
{this.renderStyle()}
901+
{this.renderCopyStyle()}
885902
{this.renderEdit()}
886903
{this.renderAspectRatio()}
887904
{this.renderImages()}
888905
{this.renderCodeOptions()}
889906
{this.renderMathOptions()}
890-
{this.renderTransform()}
891907
</ion-buttons>
892908

893909
<ion-buttons slot="end">
894910
{this.renderNotes()}
895-
{this.renderCopy()}
911+
{this.renderClone()}
912+
{this.renderTransform()}
896913
{this.renderDelete()}
897914
{this.renderMore()}
898915
</ion-buttons>
@@ -931,7 +948,7 @@ export class AppActionsElement {
931948
);
932949
}
933950

934-
private renderCopy() {
951+
private renderClone() {
935952
const displayed: boolean = this.selectedElement?.type === 'slide' || this.selectedElement?.slot?.shape !== undefined;
936953
const classSlide: string | undefined = `wider-devices ion-activatable ${displayed ? '' : 'hidden'}`;
937954

@@ -944,6 +961,24 @@ export class AppActionsElement {
944961
);
945962
}
946963

964+
private renderCopyStyle() {
965+
const displayed: boolean = this.selectedElement?.type === 'element' && this.selectedElement?.slot?.shape === undefined;
966+
const classSlide: string | undefined = `ion-activatable ${displayed ? '' : 'hidden'}`;
967+
968+
return (
969+
<button
970+
onClick={($event: UIEvent) => this.openCopyStyle($event)}
971+
aria-label="Paint format"
972+
disabled={store.state.deckBusy}
973+
class={classSlide}
974+
tabindex={displayed ? 0 : -1}>
975+
<ion-ripple-effect></ion-ripple-effect>
976+
<ion-icon aria-hidden="true" src="/assets/icons/ionicons/color-wand.svg"></ion-icon>
977+
<ion-label aria-hidden="true">Format</ion-label>
978+
</button>
979+
);
980+
}
981+
947982
private renderStyle() {
948983
return (
949984
<button onClick={() => this.openStyle()} aria-label="Style" class="ion-activatable">
@@ -985,12 +1020,12 @@ export class AppActionsElement {
9851020

9861021
private renderTransform() {
9871022
const displayed: boolean = this.selectedElement?.type === 'element' && this.selectedElement?.slot?.shape === undefined;
988-
const classToggle: string | undefined = `ion-activatable${displayed ? '' : ' hidden'}`;
1023+
const classToggle: string | undefined = `wider-devices ion-activatable${displayed ? '' : ' hidden'}`;
9891024

9901025
return (
9911026
<button aria-label="Transform" onClick={() => this.openTransform()} class={classToggle} tabindex={displayed ? 0 : -1}>
9921027
<ion-ripple-effect></ion-ripple-effect>
993-
<ion-icon aria-hidden="true" src="/assets/icons/ionicons/color-wand.svg"></ion-icon>
1028+
<ion-icon aria-hidden="true" src="/assets/icons/ionicons/flask.svg"></ion-icon>
9941029
<ion-label aria-hidden="true">Transform</ion-label>
9951030
</button>
9961031
);

0 commit comments

Comments
 (0)