Skip to content

Commit 05da03a

Browse files
committed
Merge remote-tracking branch 'origin/main' into matp-2561253
2 parents 70f0b34 + 08983d9 commit 05da03a

22 files changed

+305
-127
lines changed

powerapps-docs/developer/component-framework/component-framework-for-canvas-apps.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ After you enable the Power Apps component framework feature in your environment,
7272
> [!div class="mx-imgBorder"]
7373
> ![Insert components.](media/insert-code-components-using-get-more-components.png "Insert components")
7474
75-
4. Select the **Code** tab, select a component from the list, and then select **Import**.<!--note from editor: Here and in step 5, I deleted "sample" because maybe the reader is adding a component they truly want, not necessarily a sample.-->
75+
4. Select the **Code** tab, select a component from the list, and then select **Import**.
7676

7777
> [!div class="mx-imgBorder"]
7878
> ![Import a component.](media/insert-component-add-sample-component.png "Import a component")
@@ -83,9 +83,9 @@ After you enable the Power Apps component framework feature in your environment,
8383
> ![Add a component.](media/add-sample-component-from-list.png "Add a component")
8484
8585
> [!NOTE]
86-
> You can also add components by selecting **Insert** > **Custom** > **Import component**. This option will be removed in a future release, so we suggest using the flow described above.<!--note from editor: Recommend deleting this unless there's a mechanism in place to revisit this topic in tandem with the future release. This is especially not a good candidate for note format, since it draws extra attention to this step that won't work before long.-->
86+
> You can also add components by selecting **Insert** > **Custom** > **Import component**. This option will be removed in a future release, so we suggest using the flow described above.
87+
>
8788
88-
<!--note from editor: The following isn't really a step, so I removed the numbering and indent. -->
8989
On the **Properties** tab, you'll notice the code component properties are displayed.
9090

9191
> [!div class="mx-imgBorder"]
@@ -107,10 +107,10 @@ On the **Properties** tab, you'll notice the code component properties are displ
107107

108108
## Update existing code components
109109

110-
Whenever you update the code components and want to see the runtime changes, you need to change<!--note from editor: I don't think "bump" is going to necessarily be well-understood by non-native English readers. Maybe this should be "increase"?--> the `version` property in the manifest file. We recommend that you change the version of the component whenever you make changes.
110+
Whenever you update the code components and want to see the runtime changes, you need to change the `version` property in the manifest file. We recommend that you change the version of the component whenever you make changes.
111111

112112
> [!NOTE]
113-
> Existing code components are updated only when the app is closed or reopened in Power Apps Studio. When you reopen the app, it asks you to update the code components. Simply deleting or adding code components back into the app won't update the components.
113+
> Existing code components are updated only when the app is closed or reopened in Power Apps Studio. When you reopen the app, it asks you to update the code components. Simply deleting or adding code components back into the app won't update the components. Publish all the customizations in the updated solution first, otherwise updates made to the code component won't appear.
114114
115115
### See also
116116

@@ -119,4 +119,4 @@ Whenever you update the code components and want to see the runtime changes, you
119119
[Learn Power Apps component framework](/learn/paths/use-power-apps-component-framework)
120120

121121

122-
[!INCLUDE[footer-include](../../includes/footer-banner.md)]
122+
[!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/developer/component-framework/reference/formatting.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Model-driven and canvas apps
3939
| [formatUTCDateTimeToUserDate](formatting/formatUTCDateTimeToUserDate.md) | [!INCLUDE [formatUTCDateTimeToUserDate-description](formatting/includes/formatUTCDateTimeToUserDate-description.md)] |
4040
| [formatTime](formatting/formattime.md) | [!INCLUDE [formattime-description](formatting/includes/formattime-description.md)] |
4141
| [getWeekOfYear](formatting/getweekofyear.md) | [!INCLUDE [getweekofyear-description](formatting/includes/getweekofyear-description.md)] |
42+
| [parseDateFromInput](formatting/parseDateFromInput.md) | [!INCLUDE [parseDateFromInput-description](formatting/includes/parseDateFromInput-description.md)] |
4243

4344
## Example
4445

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Returns parsed string as date.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
title: parseDateFromInput | Microsoft Docs
3+
description: Returns parsed string as date.
4+
keywords:
5+
ms.author: nabuthuk
6+
author: Nkrb
7+
manager: kvivek
8+
ms.date: 01/05/2022
9+
ms.service: "powerapps"
10+
ms.suite: ""
11+
ms.tgt_pltfrm: ""
12+
ms.topic: "article"
13+
ms.assetid: 148964b5-106e-4f2e-8038-9086d29dc54f
14+
---
15+
16+
# parseDateFromInput
17+
18+
[!INCLUDE [parseDateFromInput-description](includes/parseDateFromInput-description.md)]
19+
20+
## Syntax
21+
22+
`context.formatting.parseDateFromInput(input, controlAttributes);`
23+
24+
## Available for
25+
26+
Model-driven and canvas apps
27+
28+
## Parameters
29+
30+
| Parameter Name | Type | Required | Description |
31+
| -------------- | ------------------ | -------- | ------------------------------- |
32+
| input | `string` | Yes | User input. |
33+
| behavior | [`ControlAttributes`](../Controlattributes.md) | Yes | `controlAttributes` control attributes used by the formatter. |
34+
35+
## Return Value
36+
37+
Type: `Date`
38+
39+
### Related topics
40+
41+
[Formatting](../formatting.md)<br/>
42+
[Power Apps component framework API reference](../../reference/index.md)<br/>
43+
[Power Apps component framework overview](../../overview.md)
44+
45+
[!INCLUDE[footer-include](../../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/event-framework.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $filter=iscustomprocessingstepallowed eq true and isvisible eq true)
6565
```
6666

6767
> [!TIP]
68-
> You can export this data to an Excel worksheet using this query and the instructions provided in this blog post: [Find Messages and tables eligible for plug-ins using the Dataverse](https://powerapps.microsoft.com/blog/find-messages-and-entities-eligible-for-plug-ins-using-the-data-platform/)
68+
> You can export this data to an Excel worksheet using this query and the instructions provided in this blog post: [Find Messages and tables eligible for plug-ins using the Dataverse](https://powerapps.microsoft.com/blog/find-messages-and-entities-eligible-for-plug-ins-using-the-common-data-service/)
6969
7070

7171
You can also use the following FetchXML to retrieve this information. The [FetchXML Builder](https://fxb.xrmtoolbox.com) is a useful tool to execute this kind of query.

powerapps-docs/maker/canvas-apps/mixed-reality-component-measure-distance.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: powerapps
66
ms.topic: conceptual
77
ms.custom: canvas
88
ms.reviewer: tapanm
9-
ms.date: 3/25/2021
9+
ms.date: 01/03/2021
1010
ms.subservice: canvas-maker
1111
ms.author: anuitz
1212
search.audienceType:
@@ -16,12 +16,13 @@ search.app:
1616
contributors:
1717
- tapanm-msft
1818
- anuitz
19+
- Alex-MSFT
1920
---
2021
# Take measurements in mixed reality
2122

22-
You can use the **Measure in MR** control in your app to let users measure distance, area, and volume. During measurement, you create two-dimensional and three-dimensional polygons that can be used to confirm how a certain-sized object would fit within a space.
23+
You can use the **Measure in MR** control in your app to let users measure distance, area, and volume. During the measurement, you create two-dimensional and three-dimensional polygons that can be used to confirm how a certain-sized object would fit within a space.
2324

24-
The control creates a button in your app. When app users click the button, it shows a live camera feed of the device. App users can then identify a starting point and then individual points to measure from. The distances of measured segments are shown directly on the live camera feed.
25+
The control creates a button in your app. When app users select the button, it shows a live camera feed of the device. App users can then identify a starting point and then individual points to measure from. The distances of measured segments are shown directly on the live camera feed.
2526

2627

2728
:::image type="content" source="./media/augmented-overview/measure-in-mixed-reality.png" alt-text="Photo showing a corner between two construction walls being measured with a mobile device.":::
@@ -49,7 +50,7 @@ With an app open for editing in [Power Apps Studio](https://create.powerapps.com
4950
:::image type="content" source="./media/augmented-measure/augmented-measure.png" alt-text="Select Measure in MR.":::
5051

5152

52-
You can modify the control with a number of properties.
53+
You can modify the control with many properties.
5354

5455

5556
### Properties
@@ -58,7 +59,7 @@ The following properties are on the control's **Measure in MR** pane on the **Pr
5859

5960
:::image type="content" source="./media/augmented-measure/augmented-measure-properties.png" alt-text="The Measure in MR pane.":::
6061

61-
Note that some properties are only available under **More options** in the **Advanced** tab on the **Measure in MR** pane.
62+
Some properties are only available under **More options** in the **Advanced** tab on the **Measure in MR** pane.
6263

6364
Property | Description | Type | Location
6465
| - | - | - | -
@@ -67,8 +68,10 @@ Measurement type | What type of measurement the user can make, whether point-to-
6768
Box Draw | Lock captured measurements to rectangular shapes by specifying only a width and a depth. | Boolean | **Properties** (also in **Advanced**)
6869
Expected Measurements (Items) | Data source (table) that lists a predefined set of measurements that you want the user to capture during a single session. You can map the labels you want to use for each measurement by using the _ItemsLabels_ property. | Not applicable | **Properties** (also in **Advanced**)
6970
ItemsLabels | A column in _Items_ with the strings you want to use as the labels for the measurements you want users to capture. | ColumnName | **Advanced**
70-
Measurements | Table describing the measured distances, volumes and areas, composed of:<ul><li>Label - String that identifies the given measurement</li><li>Id - Number that uniquely identifies this measurement</li><li>Units - String describing the base unit of this measurement</li><li>Height - Number representing the height of the captured volume, or 0 if not a completed volume or 2D area</li><li>Length - Number representing the total length of the perimeter or path of the measurement </li><li>BoundingWidth - Number representing minimum width in units that bounds the shape </li><li>BoundingDepth - Number representing the minimum depth in units that bounds the shape </li><li>Area - Number representing the estimated area of the enclosed shape in units squared </li><li>Volume - Number representing the estimated volume of the enclosed shape in units cubed </li><li>Segments - Table describing all segments in the given measurement object with the following properties:<ul><li>Length - Number representing the total distance of a given segment in the given units of measure (for example, .52)</li><li>DirectionX - Number specifying the X direction of the segment in world space (for example, 0.5)</li><li>DirectionY - Number specifying the Y direction of the measurement in world space (typically 0)</li><li>DirectionZ - Number specifying the Z direction of the measurement in world space (for example, 0.5)</li></ul></li></ul> | Table | Not applicable (output property only)
71-
Photos | The photos captured during the mixed reality session.<br/>You can [upload the mixed-reality photos to OneDrive and show them in a gallery](mixed-reality-take-upload-photos.md). | Not applicable | Not applicable (output property only)
71+
ItemsMeasurementType | (Optional) A column in _Items_ with strings that specify the measurement type overrides (distance, area, volume, freeform, or blank) for the measurements you want users to capture. | ColumnName | **Advanced**
72+
ItemsBoxDraw | (Optional) A column in _Items_ that specifies the Box Draw overrides (true, false, or blank) for the measurements you want users to capture. | ColumnName | **Advanced**
73+
Measurements | Table describing the measured distances, volumes, and areas, composed of:<ul><li>Label - String that identifies the given measurement</li><li>Id - Number that uniquely identifies this measurement</li><li>Units - String describing the base unit of this measurement</li><li>Height - Number representing the height of the captured volume, or 0 if not a completed volume or 2D area</li><li>Length - Number representing the total length of the perimeter or path of the measurement </li><li>BoundingWidth - Number representing minimum width in units that bounds the shape </li><li>BoundingDepth - Number representing the minimum depth in units that bounds the shape </li><li>Area - Number representing the estimated area of the enclosed shape in units squared </li><li>Volume - Number representing the estimated volume of the enclosed shape in units cubed </li><li>Segments - Table describing all segments in the given measurement object with the following properties:<ul><li>Length - Number representing the total distance of a given segment in the given units of measure (for example, .52)</li><li>DirectionX - Number specifying the X direction of the segment in world space (for example, 0.5)</li><li>DirectionY - Number specifying the Y direction of the measurement in world space (typically 0)</li><li>DirectionZ - Number specifying the Z direction of the measurement in world space (for example, 0.5)</li></ul></li></ul> | Table | Not applicable (output property only)
74+
Photos | The photos captured during the mixed reality session.<ul><li>ImageURI - String indicating the uniform resource identifier (URI) where the saved photo is stored.</li><li>MimeType - String describing the Multipurpose Internet Mail Extensions (MIME) type for the photo (always image/jpeg).</li><li>FileSize - Number describing size of the photo in bytes.</li><li>Label - String that identifies the measurement associated with this photo or "" if unassociated. This corresponds to the Label property in the returned Measurements Data Set.</li><br/>You can [upload the mixed-reality photos to OneDrive and show them in a gallery](mixed-reality-take-upload-photos.md). | Not applicable | Not applicable (output property only)
7275
OnMixedRealitySelect | Behavior that is triggered when exiting the MR experience with new results. | Defined action | **Advanced**
7376
OnChange | Behavior that is triggered when any property on the button is changed. | Defined action | **Advanced**
7477

@@ -117,19 +120,19 @@ OnChange | Behavior that is triggered when any property on the button is changed
117120

118121
**[PaddingTop](./controls/properties-size-___location.md)** – The distance between text in a control and the top edge of that control.
119122

120-
**[PressedBorderColor](./controls/properties-color-border.md)** – The color of a control's border when the user taps or clicks that control.
123+
**[PressedBorderColor](./controls/properties-color-border.md)** – The color of a control's border when the user selects that control.
121124

122-
**[PressedColor](./controls/properties-color-border.md)** – The color of text in a control when the user taps or clicks that control.
125+
**[PressedColor](./controls/properties-color-border.md)** – The color of text in a control when the user selects that control.
123126

124-
**[PressedFill](./controls/properties-color-border.md)** – The background color of a control when the user taps or clicks that control.
127+
**[PressedFill](./controls/properties-color-border.md)** – The background color of a control when the user selects that control.
125128

126129
**[TabIndex](./controls/properties-accessibility.md)** – Keyboard navigation order.
127130

128131
**[TextAlignment](./controls/properties-text.md)** – The alignment of the text: **Center**, **Left**, **Right**, or **Justify**
129132

130133
**[Tooltip](./controls/properties-core.md)** – Explanatory text that appears when the user hovers over a control.
131134

132-
**[VerticalAlign](./controls/properties-text.md)** – The ___location of text on a control in relation to the vertical center of that control: **Middle**, **Top**, or **Bottom**
135+
**[VerticalAlign](./controls/properties-text.md)** – The ___location of text on a control in relation to the vertical center of that control: **Middle**, **Top**, or **Bottom**.
133136

134137
**[Visible](./controls/properties-core.md)** – Whether a control appears or is hidden.
135138

powerapps-docs/maker/data-platform/create-edit-configure-settings.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Settings are solution components that enable makers and administrators to quickl
2525
> [!IMPORTANT]
2626
> - This is a preview feature and may not be available in all regions.
2727
> - [!INCLUDE[cc_preview_features_definition](../../includes/cc-preview-features-definition.md)]
28+
> - This feature is currently available for model-driven apps only.
2829
2930
Settings are made up of three subcomponents: Setting definition, setting environment value, and setting app value.
3031

Loading
Loading
Loading

0 commit comments

Comments
 (0)