react-native-a11y-order 0.9.1 → 0.11.0-rc

package/src/components/A11yView/A11yView.tsx

@@ -1,63 +1,8 @@
-import React from 'react';
-import A11yViewNativeComponent from '../../nativeSpecs/A11yViewNativeComponent';
-import type { A11yViewProps } from '../../types/A11yView.types';
-
-// Unknown ref type for better react-native support
-type ViewRefType = {};
-
-export const A11yView = React.memo(
-  React.forwardRef<ViewRefType, A11yViewProps>(
-    (
-      {
-        onScreenReaderFocused,
-        onScreenReaderSubViewFocusChange,
-        onScreenReaderSubViewFocused,
-        onScreenReaderSubViewBlurred,
-        onScreenReaderDescendantFocusChanged,
-        ...props
-      },
-      ref
-    ) => {
-      const hasHandler = Boolean(
-        onScreenReaderSubViewBlurred ||
-          onScreenReaderSubViewFocused ||
-          onScreenReaderSubViewFocusChange
-      );
-
-      const onScreenReaderChangeHandler = React.useCallback(
-        (event: { nativeEvent: { isFocused: boolean } }) => {
-          onScreenReaderSubViewFocusChange?.(event.nativeEvent.isFocused);
-          if (event.nativeEvent.isFocused) {
-            onScreenReaderSubViewFocused?.();
-          } else {
-            onScreenReaderSubViewBlurred?.();
-          }
-        },
-        [
-          onScreenReaderSubViewFocusChange,
-          onScreenReaderSubViewBlurred,
-          onScreenReaderSubViewFocused,
-        ]
-      );
-
-      const onScreenReaderHandlerProp = hasHandler
-        ? onScreenReaderChangeHandler
-        : undefined;
-
-      return (
-        <A11yViewNativeComponent
-          {...props}
-          ref={ref as React.Ref<any>}
-          descendantFocusChangedEnabled={Boolean(
-            onScreenReaderDescendantFocusChanged
-          )}
-          onScreenReaderFocused={onScreenReaderFocused}
-          onScreenReaderFocusChange={onScreenReaderHandlerProp}
-          onScreenReaderDescendantFocusChanged={
-            onScreenReaderDescendantFocusChanged
-          }
-        />
-      );
-    }
-  )
-);
+import { A11yIndex } from '../A11yIndex/A11yIndex';
+
+/**
+ * Standalone focus-tracking view with no ordering context.
+ * Use when you need screen reader focus events but no position in a sequence.
+ * For ordered elements, use {@link A11yIndex} inside an Order container.
+ */
+export const A11yView = A11yIndex;

package/src/components/A11yView/A11yView.types.ts

@@ -0,0 +1,11 @@
+import type { A11yIndexProps } from '../A11yIndex/A11yIndex.types';
+
+export type { ScreenReaderDescendantFocusChangedEvent } from '../A11yIndex/A11yIndex.types';
+
+/**
+ * Props for {@link A11y.View} — a standalone focus-tracking view with no ordering context.
+ *
+ * All screen reader focus events from {@link A11yIndexProps} are available.
+ * `index` and `orderType` are omitted because they only apply inside an `A11y.Order` sequence.
+ */
+export type A11yViewProps = Omit<A11yIndexProps, 'index' | 'orderType'>;

package/src/index.ts

@@ -1,7 +1,5 @@
 import { A11yIndex } from './components/A11yIndex/A11yIndex';
-import { A11yIndexSequence } from './components/A11ySequence/A11ySequence';
-import { A11yGroup } from './components/A11yGroup/A11yGroup';
-import { A11yUIContainer } from './components/A11yUIContainer/A11yUIContainer';
+import { A11yOrder } from './components/A11yOrder/A11yOrder';
 import {
   A11yPaneTitle,
   A11yScreenChange,
@@ -9,34 +7,43 @@ import {
 import { A11yView } from './components/A11yView/A11yView';
 import { A11yFocusFrame } from './components/A11yLock/A11yFocusFrame/A11yFocusFrame';
 import { A11yFocusTrap } from './components/A11yLock/A11yFocusTrap/A11yFocusTrap';
+import { A11yCard } from './components/A11yCard/A11yCard';
 
+// ─── Component props ──────────────────────────────────────────────────────────
+
+export type { A11yCardProps } from './components/A11yCard/A11yCard.types';
+export type { A11yOrderProps } from './components/A11yOrder/A11yOrder.types';
 export type {
-  IndexCommands,
-  A11yOrderType,
-  A11yOrderTypeEnum,
   A11yIndexProps,
-} from './types/A11yIndex.types';
-
+  A11yOrderType,
+  IndexCommands,
+} from './components/A11yIndex/A11yIndex.types';
+export { A11yOrderTypeEnum } from './components/A11yIndex/A11yIndex.types';
 export type {
-  A11yContainerTypeEnum,
-  A11yUIContainerType,
-  A11yUIContainerProps,
-} from './types/A11yUIContainerView.types';
-
-export type { ScreenReaderDescendantFocusChangedEvent } from './types/A11yView.types';
+  A11yViewProps,
+  ScreenReaderDescendantFocusChangedEvent,
+} from './components/A11yView/A11yView.types';
+export type {
+  A11yFocusTrapProps,
+  A11yFocusFrameProps,
+} from './components/A11yLock/A11yLock.types';
+export type {
+  A11yPaneTitleProps,
+  A11yScreenChangeProps,
+  A11yPaneType,
+} from './components/A11yPaneTitle/A11yPaneTitle.types';
 
-export type { A11yViewProps } from './types/A11yView.types';
+// ─── Namespace ────────────────────────────────────────────────────────────────
 
 export const A11y = {
-  Order: A11yIndexSequence,
+  Order: A11yOrder,
   Index: A11yIndex,
-  Group: A11yGroup,
-  Container: A11yUIContainer,
+  View: A11yView,
   PaneTitle: A11yPaneTitle,
   ScreenChange: A11yScreenChange,
-  View: A11yView,
   FocusFrame: A11yFocusFrame,
   FocusTrap: A11yFocusTrap,
+  Card: A11yCard,
 };
 
 export { A11yModule } from './modules/A11yAnnounceModule';

package/src/index.web.ts

@@ -4,30 +4,23 @@ import { View } from 'react-native';
 export type {
   IndexCommands,
   A11yOrderType,
-  A11yOrderTypeEnum,
   A11yIndexProps,
-} from './types/A11yIndex.types';
+} from './components/A11yIndex/A11yIndex.types';
+export { A11yOrderTypeEnum } from './components/A11yIndex/A11yIndex.types';
 
-export type {
-  A11yContainerTypeEnum,
-  A11yUIContainerType,
-  A11yUIContainerProps,
-} from './types/A11yUIContainerView.types';
-
-export type { ScreenReaderDescendantFocusChangedEvent } from './types/A11yView.types';
+export type { ScreenReaderDescendantFocusChangedEvent } from './components/A11yView/A11yView.types';
 
-export type { A11yViewProps } from './types/A11yView.types';
+export type { A11yViewProps } from './components/A11yView/A11yView.types';
 
 export const A11y = {
   Order: View,
-  Group: View,
   Index: A11yIndex,
-  Container: View,
+  View: View,
   PaneTitle: View,
   ScreenChange: View,
-  View: View,
   FocusFrame: View,
   FocusTrap: View,
+  Card: View,
 };
 
 export { A11yModule } from './modules/A11yAnnounceModule';

package/{lib/module/nativeSpecs/A11yGroupNativeComponent.ts → src/nativeSpecs/A11yCardNativeComponent.ts}

@@ -2,8 +2,8 @@ import type { ViewProps } from 'react-native';
 // eslint-disable-next-line @react-native/no-deep-imports
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 
-export interface A11yGroupNativeComponentProps extends ViewProps {}
+export interface A11yCardNativeComponentProps extends ViewProps {}
 
-export default codegenNativeComponent<A11yGroupNativeComponentProps>(
-  'A11yGroupView'
+export default codegenNativeComponent<A11yCardNativeComponentProps>(
+  'A11yCardView'
 );

package/src/nativeSpecs/A11yIndexNativeComponent.ts

@@ -15,14 +15,23 @@ export type ScreenReaderFocusChange = Readonly<{
 
 export type ScreenReaderDescendantFocusChanged = Readonly<{
   status: string;
+  nativeId?: string;
 }>;
 
 export interface A11yIndexNativeComponentProps extends ViewProps {
-  orderIndex: Int32;
-  orderKey: string;
-  orderFocusType: Int32;
+  orderIndex?: Int32;
+  orderKey?: string;
+  orderFocusType?: Int32;
+  shouldGroupAccessibilityChildren?: Int32;
 
+  autoFocus?: boolean;
+  descendantFocusChangedEnabled?: boolean;
+
+  onScreenReaderFocused?: DirectEventHandler<{}>;
+  onScreenReaderDescendantFocusChanged?: DirectEventHandler<ScreenReaderDescendantFocusChanged>;
   onScreenReaderFocusChange?: DirectEventHandler<ScreenReaderFocusChange>;
+
+  containerType?: Int32;
 }
 
 export interface NativeCommands {

package/android/src/main/java/com/a11yorder/views/A11yGroupView/A11yGroupViewManager.java

@@ -1,25 +0,0 @@
-package com.a11yorder.views.A11yGroupView;
-
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-
-import com.a11yorder.A11yGroupViewManagerSpec;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.views.view.ReactViewGroup;
-
-public class A11yGroupViewManager extends A11yGroupViewManagerSpec<ViewGroup> {
-  public static final String REACT_CLASS = "A11yGroupView";
-
-  @NonNull
-  @Override
-  public String getName() {
-    return REACT_CLASS;
-  }
-
-  @NonNull
-  @Override
-  protected ReactViewGroup createViewInstance(@NonNull ThemedReactContext context) {
-    return new ReactViewGroup(context);
-  }
-}

package/android/src/main/java/com/a11yorder/views/A11yUIContainerView/A11yUIContainerViewManager.java

@@ -1,30 +0,0 @@
-package com.a11yorder.views.A11yUIContainerView;
-
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-
-import com.a11yorder.A11yUIContainerViewManagerSpec;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.views.view.ReactViewGroup;
-
-public class A11yUIContainerViewManager extends A11yUIContainerViewManagerSpec<ViewGroup> {
-  public static final String REACT_CLASS = "A11yUIContainer";
-
-  @NonNull
-  @Override
-  public String getName() {
-    return REACT_CLASS;
-  }
-
-  @NonNull
-  @Override
-  protected ReactViewGroup createViewInstance(@NonNull ThemedReactContext context) {
-    return new ReactViewGroup(context);
-  }
-
-  @Override
-  public void setContainerType(ViewGroup view, int value) {
-    //stub
-  }
-}

package/android/src/main/java/com/a11yorder/views/A11yView/A11yViewManager.java

@@ -1,67 +0,0 @@
-package com.a11yorder.views.A11yView;
-
-import com.a11yorder.events.EventHelper;
-import com.a11yorder.events.ScreenReaderDescendantFocusChangedEvent;
-import com.a11yorder.events.ScreenReaderFocusChangedEvent;
-import com.a11yorder.events.ScreenReaderFocusedEvent;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-@ReactModule(name = A11yViewManager.NAME)
-public class A11yViewManager extends com.a11yorder.A11yViewSpec<A11yView> {
-  public static final String NAME = "A11yView";
-
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
-  @Override
-  public A11yView createViewInstance(ThemedReactContext context) {
-    return new A11yView(context);
-  }
-
-  @Override
-  public void receiveCommand(A11yView view, String commandId, @Nullable ReadableArray args) {
-    switch (commandId) {
-      case "focus": {
-        this.focus(view);
-      }
-    }
-  }
-
-  @Override
-  @ReactProp(name = "autoFocus")
-  public void setAutoFocus(A11yView view, boolean value) {
-    view.setAutoFocus(value);
-  }
-
-  @Override
-  public void setDescendantFocusChangedEnabled(A11yView view, boolean value) {
-    //stub
-  }
-
-  @Override
-  public void focus(A11yView view) {
-    view.focus();
-  }
-
-  @Nullable
-  @Override
-  public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-    Map<String, Object> export = new HashMap<>();
-
-    export.put(ScreenReaderFocusedEvent.EVENT_NAME, EventHelper.buildDirectEventMap("onScreenReaderFocused"));
-    export.put(ScreenReaderFocusChangedEvent.EVENT_NAME, EventHelper.buildDirectEventMap("onScreenReaderFocusChange"));
-    export.put(ScreenReaderDescendantFocusChangedEvent.EVENT_NAME, EventHelper.buildDirectEventMap("onScreenReaderDescendantFocusChanged"));
-
-    return export;
-  }
-}

package/android/src/newarch/A11yGroupViewManagerSpec.java

@@ -1,9 +0,0 @@
-package com.a11yorder;
-
-import android.view.ViewGroup;
-
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.viewmanagers.A11yGroupViewManagerInterface;
-
-public abstract class A11yGroupViewManagerSpec<T extends ViewGroup> extends ViewGroupManager<T> implements A11yGroupViewManagerInterface<T> {
-}

package/android/src/newarch/A11yUIContainerViewManagerSpec.java

@@ -1,8 +0,0 @@
-package com.a11yorder;
-
-import android.view.ViewGroup;
-
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.viewmanagers.A11yUIContainerManagerInterface;
-public abstract class A11yUIContainerViewManagerSpec<T extends ViewGroup> extends ViewGroupManager<T> implements A11yUIContainerManagerInterface<T> {
-}

package/android/src/newarch/A11yViewSpec.java

@@ -1,13 +0,0 @@
-package com.a11yorder;
-
-import android.view.ViewGroup;
-
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.viewmanagers.A11yViewManagerInterface;
-import com.facebook.react.views.view.ReactViewManager;
-
-import javax.annotation.Nullable;
-
-public abstract class A11yViewSpec<T extends ViewGroup> extends ReactViewManager implements A11yViewManagerInterface<T> {
-  public abstract void receiveCommand(T view, String commandId, @Nullable ReadableArray args);
-}

package/android/src/oldarch/A11yGroupViewManagerSpec.java

@@ -1,8 +0,0 @@
-package com.a11yorder;
-
-import android.view.ViewGroup;
-
-import com.facebook.react.uimanager.ViewGroupManager;
-
-public abstract class A11yGroupViewManagerSpec<T extends ViewGroup> extends ViewGroupManager<T> {
-}

package/android/src/oldarch/A11yUIContainerViewManagerSpec.java

@@ -1,9 +0,0 @@
-package com.a11yorder;
-
-import android.view.ViewGroup;
-
-import com.facebook.react.uimanager.ViewGroupManager;
-
-public abstract class A11yUIContainerViewManagerSpec<T extends ViewGroup> extends ViewGroupManager<T> {
-  public abstract void setContainerType(ViewGroup view, int value);
-}

package/android/src/oldarch/A11yViewSpec.java

@@ -1,18 +0,0 @@
-package com.a11yorder;
-
-import com.a11yorder.views.A11yView.A11yView;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.views.view.ReactViewManager;
-
-import javax.annotation.Nullable;
-
-
-public abstract class A11yViewSpec<T extends A11yView> extends ReactViewManager {
-  public abstract void setAutoFocus(T view, boolean value);
-
-  public abstract void focus(T view);
-
-  public abstract void receiveCommand(T view, String commandId, @Nullable ReadableArray args);
-
-  public abstract void setDescendantFocusChangedEnabled(A11yView view, boolean value);
-}

package/ios/views/RNAOA11yGroupView/RNAOA11yGroupView.h

@@ -1,37 +0,0 @@
-//
-//  RNAOA11yGroupView.h
-//  A11yOrder
-//
-//  Created by Artur Kalach on 13/07/2024.
-//  Copyright © 2024 Facebook. All rights reserved.
-//
-
-#ifndef RNAOA11yGroupView_h
-#define RNAOA11yGroupView_h
-
-
-#import <UIKit/UIKit.h>
-#import <React/RCTUITextField.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RNAOA11yGroupView : RCTViewComponentView
-@end
-
-NS_ASSUME_NONNULL_END
-
-
-#else /* RCT_NEW_ARCH_ENABLED */
-
-
-#import <React/RCTView.h>
-@interface RNAOA11yGroupView : RCTView
-@end
-
-#endif
-
-#endif /* RNAOA11yGroupView_h */

package/ios/views/RNAOA11yGroupView/RNAOA11yGroupView.mm

@@ -1,67 +0,0 @@
-//
-//  RNAOA11yGroupView.m
-//  A11yOrder
-//
-//  Created by Artur Kalach on 13/07/2024.
-//  Copyright © 2024 Facebook. All rights reserved.
-//
-
-
-#import <Foundation/Foundation.h>
-
-#import "RNAOA11yGroupView.h"
-#import <UIKit/UIKit.h>
-#import <React/RCTViewManager.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#include <string>
-#import <react/renderer/components/RNA11yOrderSpec/ComponentDescriptors.h>
-#import <react/renderer/components/RNA11yOrderSpec/EventEmitters.h>
-#import <react/renderer/components/RNA11yOrderSpec/Props.h>
-#import <react/renderer/components/RNA11yOrderSpec/RCTComponentViewHelpers.h>
-
-#import "RCTFabricComponentsPlugins.h"
-
-using namespace facebook::react;
-
-@interface RNAOA11yGroupView () <RCTA11yGroupViewViewProtocol>
-
-@end
-
-#endif
-
-
-
-@implementation RNAOA11yGroupView
-
-- (BOOL)shouldGroupAccessibilityChildren
-{
-  return YES;
-}
-
-#ifdef RCT_NEW_ARCH_ENABLED
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-    return concreteComponentDescriptorProvider<A11yGroupViewComponentDescriptor>();
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    if (self = [super initWithFrame:frame]) {
-        static const auto defaultProps = std::make_shared<const A11yGroupViewProps>();
-        _props = defaultProps;
-    }
-
-    return self;
-}
-
-
-Class<RCTComponentViewProtocol> A11yGroupViewCls(void)
-{
-    return RNAOA11yGroupView.class;
-}
-
-#endif
-
-@end

package/ios/views/RNAOA11yGroupView/RNAOA11yGroupViewManager.h

@@ -1,18 +0,0 @@
-//
-//  RNAOA11yGroupViewManager.h
-//  A11yOrder
-//
-//  Created by Artur Kalach on 13/07/2024.
-//  Copyright © 2024 Facebook. All rights reserved.
-//
-
-#ifndef RNAOA11yGroupViewManager_h
-#define RNAOA11yGroupViewManager_h
-
-
-#import <React/RCTViewManager.h>
-@interface RNAOA11yGroupViewManager : RCTViewManager
-@end
-
-
-#endif /* RNAOA11yGroupViewManager_h */

package/ios/views/RNAOA11yGroupView/RNAOA11yGroupViewManager.mm

@@ -1,25 +0,0 @@
-//
-//  RNAOA11yGroupViewManager.m
-//  A11yOrder
-//
-//  Created by Artur Kalach on 13/07/2024.
-//  Copyright © 2024 Facebook. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-#import <React/RCTViewManager.h>
-#import <React/RCTUIManager.h>
-#import "RNAOA11yGroupViewManager.h"
-#import "RNAOA11yGroupView.h"
-
-@implementation RNAOA11yGroupViewManager
-
-RCT_EXPORT_MODULE(A11yGroupView)
-
-- (UIView *)view
-{
-    return [[RNAOA11yGroupView alloc] init];
-}
-
-@end

package/ios/views/RNAOA11yUIContainerView/RNAOA11yUIContainerView.h

@@ -1,35 +0,0 @@
-//
-//  RNAOA11yUIContainerView.h
-//  A11yOrder
-//
-//  Created by Artur Kalach on 17/07/2025.
-//
-
-#ifndef RNAOA11yUIContainerView_h
-#define RNAOA11yUIContainerView_h
-
-#import <UIKit/UIKit.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RNAOA11yUIContainerView : RCTViewComponentView
-@end
-
-NS_ASSUME_NONNULL_END
-
-
-#else /* RCT_NEW_ARCH_ENABLED */
-
-
-#import <React/RCTView.h>
-@interface RNAOA11yUIContainerView : RCTView
-
-@end
-
-
-#endif /* RCT_NEW_ARCH_ENABLED */
-#endif /* RNAOA11yUIContainerView_h */