react-native-windows 0.0.0-canary.654 → 0.0.0-canary.656
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.
|
@@ -208,6 +208,7 @@ const Text: React.AbstractComponent<
|
|
|
208
208
|
|
|
209
209
|
const _accessible = Platform.select({
|
|
210
210
|
ios: accessible !== false,
|
|
211
|
+
windows: accessible !== false,
|
|
211
212
|
default: accessible,
|
|
212
213
|
});
|
|
213
214
|
|
|
@@ -242,18 +243,13 @@ const Text: React.AbstractComponent<
|
|
|
242
243
|
accessibilityRole={
|
|
243
244
|
role ? getAccessibilityRoleFromRole(role) : accessibilityRole
|
|
244
245
|
}
|
|
245
|
-
accessibilityState={
|
|
246
|
-
accessible={
|
|
247
|
-
accessible == null && Platform.OS === 'android'
|
|
248
|
-
? _hasOnPressOrOnLongPress
|
|
249
|
-
: _accessible
|
|
250
|
-
}
|
|
246
|
+
accessibilityState={_accessibilityState}
|
|
251
247
|
allowFontScaling={allowFontScaling !== false}
|
|
252
248
|
disabled={_disabled}
|
|
253
249
|
ellipsizeMode={ellipsizeMode ?? 'tail'}
|
|
254
250
|
isHighlighted={isHighlighted}
|
|
255
|
-
nativeID={id ?? nativeID}
|
|
256
251
|
isPressable={isPressable}
|
|
252
|
+
nativeID={id ?? nativeID}
|
|
257
253
|
numberOfLines={numberOfLines}
|
|
258
254
|
ref={forwardedRef}
|
|
259
255
|
selectable={_selectable}
|
|
@@ -307,13 +303,26 @@ const Text: React.AbstractComponent<
|
|
|
307
303
|
<NativeText
|
|
308
304
|
{...textPropsLessStyle}
|
|
309
305
|
{...eventHandlersForText}
|
|
310
|
-
|
|
306
|
+
accessibilityLabel={ariaLabel ?? accessibilityLabel}
|
|
307
|
+
accessibilityRole={
|
|
308
|
+
role ? getAccessibilityRoleFromRole(role) : accessibilityRole
|
|
309
|
+
}
|
|
310
|
+
accessibilityState={nativeTextAccessibilityState}
|
|
311
|
+
accessible={
|
|
312
|
+
accessible == null && Platform.OS === 'android'
|
|
313
|
+
? _hasOnPressOrOnLongPress
|
|
314
|
+
: _accessible
|
|
315
|
+
}
|
|
311
316
|
allowFontScaling={allowFontScaling !== false}
|
|
317
|
+
disabled={_disabled}
|
|
312
318
|
ellipsizeMode={ellipsizeMode ?? 'tail'}
|
|
313
319
|
isHighlighted={isHighlighted}
|
|
320
|
+
nativeID={id ?? nativeID}
|
|
321
|
+
numberOfLines={numberOfLines}
|
|
322
|
+
ref={forwardedRef}
|
|
323
|
+
selectable={_selectable}
|
|
314
324
|
selectionColor={selectionColor}
|
|
315
325
|
style={((rest: any): TextStyleProp)}
|
|
316
|
-
ref={forwardedRef}
|
|
317
326
|
/>
|
|
318
327
|
</TextAncestor.Provider>
|
|
319
328
|
</View>
|
|
@@ -324,13 +333,26 @@ const Text: React.AbstractComponent<
|
|
|
324
333
|
<NativeText
|
|
325
334
|
{...restProps}
|
|
326
335
|
{...eventHandlersForText}
|
|
327
|
-
|
|
336
|
+
accessibilityLabel={ariaLabel ?? accessibilityLabel}
|
|
337
|
+
accessibilityRole={
|
|
338
|
+
role ? getAccessibilityRoleFromRole(role) : accessibilityRole
|
|
339
|
+
}
|
|
340
|
+
accessibilityState={nativeTextAccessibilityState}
|
|
341
|
+
accessible={
|
|
342
|
+
accessible == null && Platform.OS === 'android'
|
|
343
|
+
? _hasOnPressOrOnLongPress
|
|
344
|
+
: _accessible
|
|
345
|
+
}
|
|
328
346
|
allowFontScaling={allowFontScaling !== false}
|
|
347
|
+
disabled={_disabled}
|
|
329
348
|
ellipsizeMode={ellipsizeMode ?? 'tail'}
|
|
330
349
|
isHighlighted={isHighlighted}
|
|
350
|
+
nativeID={id ?? nativeID}
|
|
351
|
+
numberOfLines={numberOfLines}
|
|
352
|
+
ref={forwardedRef}
|
|
353
|
+
selectable={_selectable}
|
|
331
354
|
selectionColor={selectionColor}
|
|
332
355
|
style={style}
|
|
333
|
-
ref={forwardedRef}
|
|
334
356
|
/>
|
|
335
357
|
</TextAncestor.Provider>
|
|
336
358
|
);
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
-->
|
|
11
11
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
12
12
|
<PropertyGroup>
|
|
13
|
-
<ReactNativeWindowsVersion>0.0.0-canary.
|
|
13
|
+
<ReactNativeWindowsVersion>0.0.0-canary.656</ReactNativeWindowsVersion>
|
|
14
14
|
<ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
|
|
15
15
|
<ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
|
|
16
16
|
<ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
|
|
17
17
|
<ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
|
|
18
|
-
<ReactNativeWindowsCommitId>
|
|
18
|
+
<ReactNativeWindowsCommitId>8e12ccc82efc6d981ffcefecb70a15504fdf0cb2</ReactNativeWindowsCommitId>
|
|
19
19
|
</PropertyGroup>
|
|
20
20
|
</Project>
|
|
@@ -22,7 +22,6 @@
|
|
|
22
22
|
<PropertyGroup Label="Desktop">
|
|
23
23
|
<!-- See https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt -->
|
|
24
24
|
<WinVer Condition="'$(WinVer)' == ''">_WIN32_WINNT_WIN10</WinVer>
|
|
25
|
-
<EnableBeast Condition="'$(EnableBeast)' == ''">0</EnableBeast>
|
|
26
25
|
</PropertyGroup>
|
|
27
26
|
|
|
28
27
|
<PropertyGroup>
|
|
@@ -397,7 +397,7 @@ WinRTHttpResource::PerformSendRequest(HttpMethod &&method, Uri &&rtUri, IInspect
|
|
|
397
397
|
// Ensure background thread
|
|
398
398
|
co_await winrt::resume_background();
|
|
399
399
|
|
|
400
|
-
auto props = winrt::
|
|
400
|
+
auto props = winrt::single_threaded_map<winrt::hstring, IInspectable>();
|
|
401
401
|
props.Insert(L"RequestArgs", coArgs);
|
|
402
402
|
|
|
403
403
|
auto coRequestOp = CreateRequest(std::move(coMethod), std::move(coUri), props);
|