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

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
peterpeterparker committed May 8, 2020
2 parents dcdaf9e + fa5ef8d commit ec35877
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 15 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@

### Web Components: Update

- drag-resize-rotate: v1.0.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md))
- highlight-code: v1.0.4 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md))
- inline-editor: v1.2.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/inline-editor/CHANGELOG.md))
- youtube: v1.1.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/youtube/CHANGELOG.md))

### Web Components Templates

- slide-split: v1.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/slides/split/CHANGELOG.md))
- slide-split: v1.1.3 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/slides/split/CHANGELOG.md))

### Others

Expand Down
8 changes: 8 additions & 0 deletions webcomponents/drag-resize-rotate/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<a name="1.0.1"></a>

# 1.0.1 (2020-05-08)

### Features

- slot selector on load for Stenci prerendering

<a name="1.0.0"></a>

# 1.0.0 (2020-03-18)
Expand Down
2 changes: 1 addition & 1 deletion webcomponents/drag-resize-rotate/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webcomponents/drag-resize-rotate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deckdeckgo/drag-resize-rotate",
"version": "1.0.0",
"version": "1.0.1",
"description": "A Web Component to drag, resize and rotate any element",
"main": "dist/index.js",
"module": "dist/index.mjs",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, h, Host, Prop, State, Element, Event, EventEmitter} from '@stencil/core';
import {Component, h, Host, Prop, State, Element, Event, EventEmitter, Build} from '@stencil/core';

import {unifyEvent} from '@deckdeckgo/utils';

Expand All @@ -12,7 +12,7 @@ interface ResizeMatrix {
@Component({
tag: 'deckgo-drr',
styleUrl: 'deckdeckgo-drr.scss',
shadow: true
shadow: true,
})
export class DeckdeckgoDragResizeRotate {
@Element() el: HTMLElement;
Expand Down Expand Up @@ -160,7 +160,7 @@ export class DeckdeckgoDragResizeRotate {
}

private async displaySlot() {
const element: HTMLElement = this.el.querySelector(`:scope > *`);
const element: HTMLElement = this.el.querySelector(Build.isBrowser ? `:scope > *` : '> *');

if (element && element.style.display === 'none') {
element.style.display = '';
Expand Down Expand Up @@ -416,7 +416,7 @@ export class DeckdeckgoDragResizeRotate {

return {
x: this.dragBottom || this.dragTop ? 0 : currentX - this.startX,
y: this.dragStart || this.dragEnd ? 0 : currentY - this.startY
y: this.dragStart || this.dragEnd ? 0 : currentY - this.startY,
};
}

Expand Down Expand Up @@ -512,7 +512,7 @@ export class DeckdeckgoDragResizeRotate {
a,
b,
c,
d
d,
};
}

Expand All @@ -527,7 +527,7 @@ export class DeckdeckgoDragResizeRotate {
'--height': `${this.height}${heightUnit}`,
'--top': `${this.top}${heightUnit}`,
'--left': `${this.left}${widthUnit}`,
'--rotate': this.rotate ? `${this.rotate}deg` : `0deg`
'--rotate': this.rotate ? `${this.rotate}deg` : `0deg`,
}}
class={`${this.selected ? 'selected' : ''} ${this.drag !== 'none' ? 'draggable' : ''} ${this.drag !== 'none' && this.moving ? 'drag' : ''}`}>
{this.renderEdgesAnchors()}
Expand Down Expand Up @@ -571,7 +571,7 @@ export class DeckdeckgoDragResizeRotate {
onMouseDown={() => (this.dragTopStart = true)}
onTouchStart={() => (this.dragTopStart = true)}>
<div></div>
</div>
</div>,
];
}

Expand Down Expand Up @@ -600,7 +600,7 @@ export class DeckdeckgoDragResizeRotate {
class="border start"
onClick={($event) => $event.stopPropagation()}
onMouseDown={() => (this.dragStart = true)}
onTouchStart={() => (this.dragStart = true)}></div>
onTouchStart={() => (this.dragStart = true)}></div>,
];
}

Expand Down
8 changes: 8 additions & 0 deletions webcomponents/slides/split/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<a name="1.1.3"></a>

# 1.1.3 (2020-05-08)

### Features

- slot selector on load for Stenci prerendering

<a name="1.1.2"></a>

# 1.1.2 (2020-05-07)
Expand Down
2 changes: 1 addition & 1 deletion webcomponents/slides/split/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webcomponents/slides/split/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deckdeckgo/slide-split",
"version": "1.1.2",
"version": "1.1.3",
"description": "The Split template is a simple slide to display the content in two columns on a slide of your presentation",
"main": "dist/index.js",
"module": "dist/index.mjs",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, Element, Event, EventEmitter, Method, Prop, h, Host} from '@stencil/core';
import {Component, Element, Event, EventEmitter, Method, Prop, h, Host, Build} from '@stencil/core';

import {
DeckdeckgoSlide,
Expand Down Expand Up @@ -71,7 +71,7 @@ export class DeckdeckgoSlideSplit implements DeckdeckgoSlide {
return;
}

const element: HTMLElement = this.el.querySelector(':scope > deckgo-demo');
const element: HTMLElement = this.el.querySelector(Build.isBrowser ? ':scope > deckgo-demo' : '> deckgo-demo');

if (element && typeof (element as any).updateIFrame === 'function') {
await (element as any).updateIFrame();
Expand Down

0 comments on commit ec35877

Please sign in to comment.