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

Commit 6080647

Browse files
peterpeterparkerpeterpeterparker
committed
merge: floating text
2 parents 424375c + a418bc2 commit 6080647

File tree

41 files changed

+1313
-1056
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1313
-1056
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@ David
4242
### Web Components
4343

4444
- core: v1.1.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md))
45+
- drag-resize-rotate: v1.1.3 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md))
4546
- highlight-code: v1.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md))
4647
- social: v2.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/social/CHANGELOG.md))
4748

4849
### Others
4950

5051
- gatsby-remark-highlight-code: v1.4.4 ([CHANGELOG](https://github.com/deckgo/gatsby-remark-highlight-code/blob/master/CHANGELOG.md))
5152
- slide-utils: v2.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/utils/slide/CHANGELOG.md))
52-
- starter kit: v2.6.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo-starter/blob/master/CHANGELOG.md))
53+
- starter kit: v2.6.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo-starter/blob/master/CHANGELOG.md))
5354

5455
<a name="1.5.0"></a>
5556

‎docs/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- group `notes` in a single page
66
- add new `header` and `footer`
7+
- property `text` of `@deckdeckgo/drag-resize-rotate`
78

89
# 1.6.2 (2020-07-02)
910

‎docs/docs/components/app-components-drr/app-components-drr.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,13 @@ The default slot is mandatory.
8383

8484
This component offers the following options which could be set using attributes:
8585

86-
| Attribute | Type | Default | Description |
87-
| --------- | ----------------------------------- | ------------ | ----------------------------------------------------------------------------------------------------------------- |
88-
| unit | 'percentage', 'viewport' or 'px' | 'percentage' | The component could be use with percentage, viewport (vw/vh) or pixels (px) units. All relative to the container. |
89-
| resize | boolean | true | Allow or not the resize actions |
90-
| drag | 'x-axis', 'y-axis', 'all' or 'none' | 'all' | Allow the component to be dragged in which direction |
91-
| rotation | boolean | true | Allow or not the rotation of the element |
86+
| Attribute | Type | Default | Description |
87+
| --------- | ----------------------------------- | ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
88+
| unit | 'percentage', 'viewport' or 'px' | 'percentage' | The component could be use with percentage, viewport (vw/vh) or pixels (px) units. All relative to the container. |
89+
| resize | boolean | true | Allow or not the resize actions |
90+
| drag | 'x-axis', 'y-axis', 'all' or 'none' | 'all' | Allow the component to be dragged in which direction |
91+
| rotation | boolean | true | Allow or not the rotation of the element |
92+
| text | boolean | false | To be used if your slotted element is to be defined as `contentEditable`. Useful for text edition. Note that if turns to `true`, the property `resize` is going to be set to `false` automatically. |
9293

9394
### Event listeners
9495

‎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
@@ -19,7 +19,7 @@
1919
"@deckdeckgo/core": "^1.1.0",
2020
"@deckdeckgo/deck-utils": "^2.3.1",
2121
"@deckdeckgo/demo": "^1.0.4",
22-
"@deckdeckgo/drag-resize-rotate": "^1.0.2",
22+
"@deckdeckgo/drag-resize-rotate": "^1.1.3",
2323
"@deckdeckgo/highlight-code": "^1.1.2",
2424
"@deckdeckgo/inline-editor": "^1.4.0",
2525
"@deckdeckgo/lazy-img": "^1.0.1",

‎docs/src/app/pages/docs/components/app-components-drr/app-components-drr.tsx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,15 @@ export class AppComponentsDrr {
160160
<td>true</td>
161161
<td>Allow or not the rotation of the element</td>
162162
</tr>
163+
<tr>
164+
<td>text</td>
165+
<td>boolean</td>
166+
<td>false</td>
167+
<td>
168+
To be used if your slotted element is to be defined as <code>contentEditable</code>. Useful for text edition. Note that if turns to{' '}
169+
<code>true</code>, the property <code>resize</code> is going to be set to <code>false</code> automatically.
170+
</td>
171+
</tr>
163172
</tbody>
164173
</table>
165174
<h3 id="app-components-drr-event-listeners">Event listeners</h3>

‎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
@@ -19,7 +19,7 @@
1919
"@deckdeckgo/core": "^1.1.0",
2020
"@deckdeckgo/deck-utils": "^2.3.1",
2121
"@deckdeckgo/demo": "^1.0.4",
22-
"@deckdeckgo/drag-resize-rotate": "^1.0.2",
22+
"@deckdeckgo/drag-resize-rotate": "^1.1.3",
2323
"@deckdeckgo/highlight-code": "^1.1.2",
2424
"@deckdeckgo/lazy-img": "^1.0.1",
2525
"@deckdeckgo/math": "^1.0.1",

‎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
@@ -21,7 +21,7 @@
2121
"@deckdeckgo/core": "^1.1.0",
2222
"@deckdeckgo/deck-utils": "^2.3.1",
2323
"@deckdeckgo/demo": "^1.0.4",
24-
"@deckdeckgo/drag-resize-rotate": "^1.0.2",
24+
"@deckdeckgo/drag-resize-rotate": "^1.1.3",
2525
"@deckdeckgo/highlight-code": "^1.1.2",
2626
"@deckdeckgo/inline-editor": "^1.4.0",
2727
"@deckdeckgo/lazy-img": "^1.0.1",

0 commit comments

Comments
 (0)