@builder.io/sdk-svelte 0.0.1-0 → 0.0.1-11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (97) hide show
  1. package/README.md +15 -0
  2. package/package.json +16 -4
  3. package/src/blocks/{button.svelte → button/button.svelte} +29 -18
  4. package/src/blocks/button/component-info.js +41 -0
  5. package/src/blocks/{columns.svelte → columns/columns.svelte} +22 -14
  6. package/src/blocks/columns/component-info.js +217 -0
  7. package/src/blocks/custom-code/component-info.js +31 -0
  8. package/src/blocks/custom-code/custom-code.svelte +64 -0
  9. package/src/blocks/embed/component-info.js +24 -0
  10. package/src/blocks/embed/embed.svelte +63 -0
  11. package/src/blocks/form/component-info.js +262 -0
  12. package/src/blocks/{form.svelte → form/form.svelte} +49 -16
  13. package/src/blocks/fragment/component-info.js +11 -0
  14. package/src/blocks/{fragment.svelte → fragment/fragment.svelte} +5 -2
  15. package/src/blocks/image/component-info.js +104 -0
  16. package/src/blocks/{image.svelte → image/image.svelte} +27 -9
  17. package/src/blocks/img/component-info.js +20 -0
  18. package/src/blocks/{img.svelte → img/img.svelte} +5 -2
  19. package/src/blocks/input/component-info.js +74 -0
  20. package/src/blocks/{input.svelte → input/input.svelte} +5 -2
  21. package/src/blocks/raw-text/component-info.js +16 -0
  22. package/src/blocks/{raw-text.svelte → raw-text/raw-text.svelte} +4 -1
  23. package/src/blocks/section/component-info.js +49 -0
  24. package/src/blocks/{section.svelte → section/section.svelte} +4 -1
  25. package/src/blocks/select/component-info.js +59 -0
  26. package/src/blocks/{select.svelte → select/select.svelte} +10 -3
  27. package/src/blocks/submit-button/component-info.js +28 -0
  28. package/src/blocks/{submit-button.svelte → submit-button/submit-button.svelte} +4 -1
  29. package/src/blocks/symbol/component-info.js +43 -0
  30. package/src/blocks/symbol/symbol.svelte +54 -0
  31. package/src/blocks/text/component-info.js +24 -0
  32. package/src/blocks/{text.svelte → text/text.svelte} +4 -1
  33. package/src/blocks/textarea/component-info.js +47 -0
  34. package/src/blocks/{textarea.svelte → textarea/textarea.svelte} +4 -1
  35. package/src/blocks/video/component-info.js +106 -0
  36. package/src/blocks/{video.svelte → video/video.svelte} +4 -1
  37. package/src/components/error-boundary.svelte +4 -1
  38. package/src/components/render-block/block-styles.svelte +51 -0
  39. package/src/components/render-block/render-block.helpers.js +23 -0
  40. package/src/components/render-block/render-block.svelte +182 -0
  41. package/src/components/render-blocks.svelte +18 -6
  42. package/src/components/render-content/components/render-styles.svelte +8 -13
  43. package/src/components/render-content/index.js +4 -0
  44. package/src/components/render-content/render-content.svelte +210 -174
  45. package/src/components/render-inlined-styles.svelte +51 -0
  46. package/src/constants/builder-registered-components.js +45 -0
  47. package/src/constants/device-sizes.js +4 -11
  48. package/src/constants/target.js +3 -10
  49. package/src/context/builder.context.js +6 -31
  50. package/src/functions/evaluate.js +8 -31
  51. package/src/functions/event-handler-name.js +3 -10
  52. package/src/functions/fast-clone.js +4 -0
  53. package/src/functions/get-block-actions.js +6 -29
  54. package/src/functions/get-block-component-options.js +3 -9
  55. package/src/functions/get-block-properties.js +3 -9
  56. package/src/functions/get-block-styles.js +6 -27
  57. package/src/functions/get-block-tag.js +3 -10
  58. package/src/functions/get-builder-search-params/fn.test.js +3 -21
  59. package/src/functions/get-builder-search-params/index.js +4 -11
  60. package/src/functions/get-content/fn.test.js +3 -21
  61. package/src/functions/get-content/index.js +8 -28
  62. package/src/functions/get-fetch.js +31 -32
  63. package/src/functions/get-global-this.js +3 -10
  64. package/src/functions/get-processed-block.js +9 -30
  65. package/src/functions/get-processed-block.test.js +2 -20
  66. package/src/functions/if-target.js +5 -28
  67. package/src/functions/is-browser.js +3 -10
  68. package/src/functions/is-editing.js +5 -28
  69. package/src/functions/is-iframe.js +5 -28
  70. package/src/functions/is-previewing.js +7 -30
  71. package/src/functions/on-change.js +4 -11
  72. package/src/functions/on-change.test.js +4 -22
  73. package/src/functions/previewing-model-name.js +5 -28
  74. package/src/functions/register-component.js +32 -36
  75. package/src/functions/register.js +5 -28
  76. package/src/functions/set-editor-settings.js +5 -28
  77. package/src/functions/set.js +3 -10
  78. package/src/functions/set.test.js +4 -22
  79. package/src/functions/track.js +8 -31
  80. package/src/functions/transform-block.js +3 -10
  81. package/src/index-helpers/blocks-exports.js +19 -42
  82. package/src/index-helpers/top-of-file.js +3 -10
  83. package/src/index.js +10 -32
  84. package/src/scripts/init-editing.js +72 -81
  85. package/src/types/builder-block.js +0 -3
  86. package/src/types/builder-content.js +0 -3
  87. package/src/types/components.js +0 -0
  88. package/src/types/deep-partial.js +0 -3
  89. package/src/types/element.js +0 -0
  90. package/src/types/targets.js +0 -3
  91. package/src/types/typescript.js +0 -3
  92. package/src/blocks/custom-code.svelte +0 -63
  93. package/src/blocks/embed.svelte +0 -62
  94. package/src/blocks/symbol.svelte +0 -55
  95. package/src/components/block-styles.svelte +0 -23
  96. package/src/components/render-block.svelte +0 -121
  97. package/src/functions/macro-eval.js +0 -12
@@ -0,0 +1,74 @@
1
+ const componentInfo = {
2
+ name: "Form:Input",
3
+ builtIn: true,
4
+ image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2Fad6f37889d9e40bbbbc72cdb5875d6ca",
5
+ inputs: [
6
+ {
7
+ name: "type",
8
+ type: "text",
9
+ enum: [
10
+ "text",
11
+ "number",
12
+ "email",
13
+ "url",
14
+ "checkbox",
15
+ "radio",
16
+ "range",
17
+ "date",
18
+ "datetime-local",
19
+ "search",
20
+ "tel",
21
+ "time",
22
+ "file",
23
+ "month",
24
+ "week",
25
+ "password",
26
+ "color",
27
+ "hidden"
28
+ ],
29
+ defaultValue: "text"
30
+ },
31
+ {
32
+ name: "name",
33
+ type: "string",
34
+ required: true,
35
+ helperText: 'Every input in a form needs a unique name describing what it takes, e.g. "email"'
36
+ },
37
+ {
38
+ name: "placeholder",
39
+ type: "string",
40
+ defaultValue: "Hello there",
41
+ helperText: "Text to display when there is no value"
42
+ },
43
+ {
44
+ name: "defaultValue",
45
+ type: "string"
46
+ },
47
+ {
48
+ name: "value",
49
+ type: "string",
50
+ advanced: true
51
+ },
52
+ {
53
+ name: "required",
54
+ type: "boolean",
55
+ helperText: "Is this input required to be filled out to submit a form",
56
+ defaultValue: false
57
+ }
58
+ ],
59
+ noWrap: true,
60
+ static: true,
61
+ defaultStyles: {
62
+ paddingTop: "10px",
63
+ paddingBottom: "10px",
64
+ paddingLeft: "10px",
65
+ paddingRight: "10px",
66
+ borderRadius: "3px",
67
+ borderWidth: "1px",
68
+ borderStyle: "solid",
69
+ borderColor: "#ccc"
70
+ }
71
+ };
72
+ export {
73
+ componentInfo
74
+ };
@@ -3,10 +3,11 @@
3
3
 
4
4
 
5
5
 
6
- import { isEditing } from '../functions/is-editing';
6
+ import { isEditing } from '../../functions/is-editing.js';
7
7
 
8
8
 
9
9
 
10
+
10
11
 
11
12
 
12
13
  export let attributes;
@@ -16,11 +17,13 @@ export let type;
16
17
  export let name;
17
18
  export let value;
18
19
  export let required;
19
-
20
+
20
21
 
21
22
 
22
23
 
23
24
 
25
+
26
+
24
27
 
25
28
 
26
29
 
@@ -0,0 +1,16 @@
1
+ const componentInfo = {
2
+ name: "Builder:RawText",
3
+ hideFromInsertMenu: true,
4
+ builtIn: true,
5
+ inputs: [
6
+ {
7
+ name: "text",
8
+ bubble: true,
9
+ type: "longText",
10
+ required: true
11
+ }
12
+ ]
13
+ };
14
+ export {
15
+ componentInfo
16
+ };
@@ -6,15 +6,18 @@
6
6
 
7
7
 
8
8
 
9
+
9
10
 
10
11
 
11
12
  export let attributes;
12
13
  export let text;
13
-
14
+
14
15
 
15
16
 
16
17
 
17
18
 
19
+
20
+
18
21
 
19
22
 
20
23
 
@@ -0,0 +1,49 @@
1
+ const componentInfo = {
2
+ name: "Core:Section",
3
+ static: true,
4
+ builtIn: true,
5
+ image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2F682efef23ace49afac61748dd305c70a",
6
+ inputs: [
7
+ {
8
+ name: "maxWidth",
9
+ type: "number",
10
+ defaultValue: 1200
11
+ },
12
+ {
13
+ name: "lazyLoad",
14
+ type: "boolean",
15
+ defaultValue: false,
16
+ advanced: true,
17
+ description: "Only render this section when in view"
18
+ }
19
+ ],
20
+ defaultStyles: {
21
+ paddingLeft: "20px",
22
+ paddingRight: "20px",
23
+ paddingTop: "50px",
24
+ paddingBottom: "50px",
25
+ marginTop: "0px",
26
+ width: "100vw",
27
+ marginLeft: "calc(50% - 50vw)"
28
+ },
29
+ canHaveChildren: true,
30
+ defaultChildren: [
31
+ {
32
+ "@type": "@builder.io/sdk:Element",
33
+ responsiveStyles: {
34
+ large: {
35
+ textAlign: "center"
36
+ }
37
+ },
38
+ component: {
39
+ name: "Text",
40
+ options: {
41
+ text: "<p><b>I am a section! My content keeps from getting too wide, so that it's easy to read even on big screens.</b></p><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur</p>"
42
+ }
43
+ }
44
+ }
45
+ ]
46
+ };
47
+ export {
48
+ componentInfo
49
+ };
@@ -6,16 +6,19 @@
6
6
 
7
7
 
8
8
 
9
+
9
10
 
10
11
 
11
12
  export let attributes;
12
13
  export let maxWidth;
13
- export let children;
14
14
 
15
15
 
16
16
 
17
+
17
18
 
18
19
 
20
+
21
+
19
22
 
20
23
 
21
24
 
@@ -0,0 +1,59 @@
1
+ const componentInfo = {
2
+ name: "Form:Select",
3
+ builtIn: true,
4
+ image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2F83acca093fb24aaf94dee136e9a4b045",
5
+ defaultStyles: {
6
+ alignSelf: "flex-start"
7
+ },
8
+ inputs: [
9
+ {
10
+ name: "options",
11
+ type: "list",
12
+ required: true,
13
+ subFields: [
14
+ {
15
+ name: "value",
16
+ type: "text",
17
+ required: true
18
+ },
19
+ {
20
+ name: "name",
21
+ type: "text"
22
+ }
23
+ ],
24
+ defaultValue: [
25
+ {
26
+ value: "option 1"
27
+ },
28
+ {
29
+ value: "option 2"
30
+ }
31
+ ]
32
+ },
33
+ {
34
+ name: "name",
35
+ type: "string",
36
+ required: true,
37
+ helperText: 'Every select in a form needs a unique name describing what it gets, e.g. "email"'
38
+ },
39
+ {
40
+ name: "defaultValue",
41
+ type: "string"
42
+ },
43
+ {
44
+ name: "value",
45
+ type: "string",
46
+ advanced: true
47
+ },
48
+ {
49
+ name: "required",
50
+ type: "boolean",
51
+ defaultValue: false
52
+ }
53
+ ],
54
+ static: true,
55
+ noWrap: true
56
+ };
57
+ export {
58
+ componentInfo
59
+ };
@@ -3,10 +3,11 @@
3
3
 
4
4
 
5
5
 
6
- import { isEditing } from '../functions/is-editing';
6
+ import { isEditing } from '../../functions/is-editing.js';
7
7
 
8
8
 
9
9
 
10
+
10
11
 
11
12
 
12
13
  export let attributes;
@@ -14,11 +15,13 @@ export let value;
14
15
  export let defaultValue;
15
16
  export let name;
16
17
  export let options;
17
-
18
+
18
19
 
19
20
 
20
21
 
21
22
 
23
+
24
+
22
25
 
23
26
 
24
27
 
@@ -29,6 +32,10 @@ export let options;
29
32
 
30
33
  <select {...attributes} value={value} key={isEditing() && defaultValue ? defaultValue : 'default-key'} defaultValue={defaultValue} name={name} >
31
34
 
32
- {#each options as option }<option value={option.value} >{option.name || option.value}</option>{/each}
35
+
36
+ {#each options as option, index }
37
+ <option value={option.value} >{option.name || option.value}</option>
38
+ {/each}
39
+
33
40
 
34
41
  </select>
@@ -0,0 +1,28 @@
1
+ const componentInfo = {
2
+ name: "Form:SubmitButton",
3
+ builtIn: true,
4
+ image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2Fdf2820ffed1f4349a94c40b3221f5b98",
5
+ defaultStyles: {
6
+ appearance: "none",
7
+ paddingTop: "15px",
8
+ paddingBottom: "15px",
9
+ paddingLeft: "25px",
10
+ paddingRight: "25px",
11
+ backgroundColor: "#3898EC",
12
+ color: "white",
13
+ borderRadius: "4px",
14
+ cursor: "pointer"
15
+ },
16
+ inputs: [
17
+ {
18
+ name: "text",
19
+ type: "text",
20
+ defaultValue: "Click me"
21
+ }
22
+ ],
23
+ static: true,
24
+ noWrap: true
25
+ };
26
+ export {
27
+ componentInfo
28
+ };
@@ -0,0 +1,43 @@
1
+ const componentInfo = {
2
+ name: "Symbol",
3
+ noWrap: true,
4
+ static: true,
5
+ builtIn: true,
6
+ inputs: [
7
+ {
8
+ name: "symbol",
9
+ type: "uiSymbol"
10
+ },
11
+ {
12
+ name: "dataOnly",
13
+ helperText: "Make this a data symbol that doesn't display any UI",
14
+ type: "boolean",
15
+ defaultValue: false,
16
+ advanced: true,
17
+ hideFromUI: true
18
+ },
19
+ {
20
+ name: "inheritState",
21
+ helperText: "Inherit the parent component state and data",
22
+ type: "boolean",
23
+ defaultValue: false,
24
+ advanced: true
25
+ },
26
+ {
27
+ name: "renderToLiquid",
28
+ helperText: "Render this symbols contents to liquid. Turn off to fetch with javascript and use custom targeting",
29
+ type: "boolean",
30
+ defaultValue: false,
31
+ advanced: true,
32
+ hideFromUI: true
33
+ },
34
+ {
35
+ name: "useChildren",
36
+ hideFromUI: true,
37
+ type: "boolean"
38
+ }
39
+ ]
40
+ };
41
+ export {
42
+ componentInfo
43
+ };
@@ -0,0 +1,54 @@
1
+ <script>
2
+ import { onMount } from 'svelte'
3
+ import { afterUpdate } from 'svelte'
4
+
5
+
6
+ import RenderContent, { } from '../../components/render-content/render-content.svelte';
7
+ import BuilderContext, { } from '../../context/builder.context';
8
+ import { getContent } from '../../functions/get-content/index.js';
9
+
10
+
11
+
12
+ import { getContext, setContext } from "svelte";
13
+
14
+
15
+ export let attributes;
16
+ export let symbol;
17
+
18
+
19
+
20
+
21
+ let builderContext = getContext(BuilderContext.key);
22
+
23
+ let className = 'builder-symbol';
24
+ let content = null;
25
+
26
+ onMount(() => { content = symbol?.content; });
27
+
28
+ afterUpdate(() => { const symbolToUse = symbol;
29
+
30
+ if (symbolToUse && !symbolToUse.content && !content && symbolToUse.model) {
31
+ getContent({
32
+ model: symbolToUse.model,
33
+ apiKey: builderContext.apiKey,
34
+ options: {
35
+ entry: symbolToUse.entry
36
+ }
37
+ }).then(response => {
38
+ content = response;
39
+ });
40
+ } })
41
+
42
+
43
+ </script>
44
+
45
+ <div {...attributes} dataSet={{
46
+ class: className
47
+ }} class={className} >
48
+
49
+ <RenderContent apiKey={builderContext.apiKey} context={builderContext.context} data={{ ...symbol?.data,
50
+ ...builderContext.state,
51
+ ...symbol?.content?.data?.state
52
+ }} model={symbol?.model} content={content} ></RenderContent>
53
+
54
+ </div>
@@ -0,0 +1,24 @@
1
+ const componentInfo = {
2
+ name: "Text",
3
+ static: true,
4
+ builtIn: true,
5
+ image: "https://firebasestorage.googleapis.com/v0/b/builder-3b0a2.appspot.com/o/images%2Fbaseline-text_fields-24px%20(1).svg?alt=media&token=12177b73-0ee3-42ca-98c6-0dd003de1929",
6
+ inputs: [
7
+ {
8
+ name: "text",
9
+ type: "html",
10
+ required: true,
11
+ autoFocus: true,
12
+ bubble: true,
13
+ defaultValue: "Enter some text..."
14
+ }
15
+ ],
16
+ defaultStyles: {
17
+ lineHeight: "normal",
18
+ height: "auto",
19
+ textAlign: "center"
20
+ }
21
+ };
22
+ export {
23
+ componentInfo
24
+ };
@@ -0,0 +1,47 @@
1
+ const componentInfo = {
2
+ name: "Form:TextArea",
3
+ builtIn: true,
4
+ image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2Ff74a2f3de58c4c3e939204e5b6b8f6c3",
5
+ inputs: [
6
+ {
7
+ advanced: true,
8
+ name: "value",
9
+ type: "string"
10
+ },
11
+ {
12
+ name: "name",
13
+ type: "string",
14
+ required: true,
15
+ helperText: 'Every input in a form needs a unique name describing what it gets, e.g. "email"'
16
+ },
17
+ {
18
+ name: "defaultValue",
19
+ type: "string"
20
+ },
21
+ {
22
+ name: "placeholder",
23
+ type: "string",
24
+ defaultValue: "Hello there"
25
+ },
26
+ {
27
+ name: "required",
28
+ type: "boolean",
29
+ defaultValue: false
30
+ }
31
+ ],
32
+ defaultStyles: {
33
+ paddingTop: "10px",
34
+ paddingBottom: "10px",
35
+ paddingLeft: "10px",
36
+ paddingRight: "10px",
37
+ borderRadius: "3px",
38
+ borderWidth: "1px",
39
+ borderStyle: "solid",
40
+ borderColor: "#ccc"
41
+ },
42
+ static: true,
43
+ noWrap: true
44
+ };
45
+ export {
46
+ componentInfo
47
+ };
@@ -6,6 +6,7 @@
6
6
 
7
7
 
8
8
 
9
+
9
10
 
10
11
 
11
12
  export let attributes;
@@ -13,11 +14,13 @@ export let placeholder;
13
14
  export let name;
14
15
  export let value;
15
16
  export let defaultValue;
16
-
17
+
17
18
 
18
19
 
19
20
 
20
21
 
22
+
23
+
21
24
 
22
25
 
23
26
 
@@ -0,0 +1,106 @@
1
+ const componentInfo = {
2
+ name: "Video",
3
+ canHaveChildren: true,
4
+ builtIn: true,
5
+ defaultStyles: {
6
+ minHeight: "20px",
7
+ minWidth: "20px"
8
+ },
9
+ image: "https://firebasestorage.googleapis.com/v0/b/builder-3b0a2.appspot.com/o/images%2Fbaseline-videocam-24px%20(1).svg?alt=media&token=49a84e4a-b20e-4977-a650-047f986874bb",
10
+ inputs: [
11
+ {
12
+ name: "video",
13
+ type: "file",
14
+ allowedFileTypes: ["mp4"],
15
+ bubble: true,
16
+ defaultValue: "https://firebasestorage.googleapis.com/v0/b/builder-3b0a2.appspot.com/o/assets%2FKQlEmWDxA0coC3PK6UvkrjwkIGI2%2F28cb070609f546cdbe5efa20e931aa4b?alt=media&token=912e9551-7a7c-4dfb-86b6-3da1537d1a7f",
17
+ required: true
18
+ },
19
+ {
20
+ name: "posterImage",
21
+ type: "file",
22
+ allowedFileTypes: ["jpeg", "png"],
23
+ helperText: "Image to show before the video plays"
24
+ },
25
+ {
26
+ name: "autoPlay",
27
+ type: "boolean",
28
+ defaultValue: true
29
+ },
30
+ {
31
+ name: "controls",
32
+ type: "boolean",
33
+ defaultValue: false
34
+ },
35
+ {
36
+ name: "muted",
37
+ type: "boolean",
38
+ defaultValue: true
39
+ },
40
+ {
41
+ name: "loop",
42
+ type: "boolean",
43
+ defaultValue: true
44
+ },
45
+ {
46
+ name: "playsInline",
47
+ type: "boolean",
48
+ defaultValue: true
49
+ },
50
+ {
51
+ name: "fit",
52
+ type: "text",
53
+ defaultValue: "cover",
54
+ enum: ["contain", "cover", "fill", "auto"]
55
+ },
56
+ {
57
+ name: "fitContent",
58
+ type: "boolean",
59
+ helperText: "When child blocks are provided, fit to them instead of using the aspect ratio",
60
+ defaultValue: true,
61
+ advanced: true
62
+ },
63
+ {
64
+ name: "position",
65
+ type: "text",
66
+ defaultValue: "center",
67
+ enum: [
68
+ "center",
69
+ "top",
70
+ "left",
71
+ "right",
72
+ "bottom",
73
+ "top left",
74
+ "top right",
75
+ "bottom left",
76
+ "bottom right"
77
+ ]
78
+ },
79
+ {
80
+ name: "height",
81
+ type: "number",
82
+ advanced: true
83
+ },
84
+ {
85
+ name: "width",
86
+ type: "number",
87
+ advanced: true
88
+ },
89
+ {
90
+ name: "aspectRatio",
91
+ type: "number",
92
+ advanced: true,
93
+ defaultValue: 0.7004048582995948
94
+ },
95
+ {
96
+ name: "lazyLoad",
97
+ type: "boolean",
98
+ helperText: 'Load this video "lazily" - as in only when a user scrolls near the video. Recommended for optmized performance and bandwidth consumption',
99
+ defaultValue: true,
100
+ advanced: true
101
+ }
102
+ ]
103
+ };
104
+ export {
105
+ componentInfo
106
+ };
@@ -6,6 +6,7 @@
6
6
 
7
7
 
8
8
 
9
+
9
10
 
10
11
 
11
12
  export let attributes;
@@ -17,11 +18,13 @@ export let autoPlay;
17
18
  export let muted;
18
19
  export let controls;
19
20
  export let loop;
20
-
21
+
21
22
 
22
23
 
23
24
 
24
25
 
26
+
27
+
25
28
 
26
29
 
27
30