From 058cdec05332f67494c04449a8815cfbb3e08981 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Tue, 12 Mar 2019 09:36:28 -0700
Subject: [PATCH] fix: improve accessible page structure

Makes some progress on #294
---
 README.md                              |  1 -
 src/components/picker/nimble-picker.js | 11 +++++------
 src/components/preview.js              |  8 ++++----
 src/components/search.js               |  4 ++--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index d0a9ef0..b0128f3 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,6 @@ import { Picker } from 'emoji-mart'
 ```js
 search: 'Search',
 clear: 'Clear', // Accessible label on "clear" button
-emojilist: 'List of emoji', // Accessible title for list of emoji
 notfound: 'No Emoji Found',
 skintext: 'Choose your default skin tone',
 categories: {
diff --git a/src/components/picker/nimble-picker.js b/src/components/picker/nimble-picker.js
index 7324ae3..736e92f 100644
--- a/src/components/picker/nimble-picker.js
+++ b/src/components/picker/nimble-picker.js
@@ -19,7 +19,6 @@ import { PickerDefaultProps } from '../../utils/shared-default-props'
 const I18N = {
   search: 'Search',
   clear: 'Clear', // Accessible label on "clear" button
-  emojilist: 'List of emoji', // Accessible title for list of emoji
   notfound: 'No Emoji Found',
   skintext: 'Choose your default skin tone',
   categories: {
@@ -501,9 +500,10 @@ export default class NimblePicker extends React.PureComponent {
       width = perLine * (emojiSize + 12) + 12 + 2 + measureScrollbar()
 
     return (
-      <div
+      <section
         style={{ width: width, ...style }}
         className="emoji-mart"
+        aria-label={title}
         onKeyDown={this.handleKeyDown}
       >
         <div className="emoji-mart-bar">
@@ -530,10 +530,9 @@ export default class NimblePicker extends React.PureComponent {
           autoFocus={autoFocus}
         />
 
-        <section
+        <div
           ref={this.setScrollRef}
           className="emoji-mart-scroll"
-          aria-label={this.i18n.emojilist}
           onScroll={this.handleScroll}
         >
           {this.getCategories().map((category, i) => {
@@ -577,7 +576,7 @@ export default class NimblePicker extends React.PureComponent {
               />
             )
           })}
-        </section>
+        </div>
 
         {(showPreview || showSkinTones) && (
           <div className="emoji-mart-bar">
@@ -607,7 +606,7 @@ export default class NimblePicker extends React.PureComponent {
             />
           </div>
         )}
-      </div>
+      </section>
     )
   }
 }
diff --git a/src/components/preview.js b/src/components/preview.js
index a4904b1..f908508 100644
--- a/src/components/preview.js
+++ b/src/components/preview.js
@@ -43,7 +43,7 @@ export default class Preview extends React.PureComponent {
 
       return (
         <div className="emoji-mart-preview">
-          <div className="emoji-mart-preview-emoji">
+          <div className="emoji-mart-preview-emoji" aria-hidden="true">
             {NimbleEmoji({
               key: emoji.id,
               emoji: emoji,
@@ -52,7 +52,7 @@ export default class Preview extends React.PureComponent {
             })}
           </div>
 
-          <div className="emoji-mart-preview-data">
+          <div className="emoji-mart-preview-data" aria-hidden="true">
             <div className="emoji-mart-preview-name">{emoji.name}</div>
             <div className="emoji-mart-preview-shortnames">
               {emojiData.short_names.map((short_name) => (
@@ -74,13 +74,13 @@ export default class Preview extends React.PureComponent {
     } else {
       return (
         <div className="emoji-mart-preview">
-          <div className="emoji-mart-preview-emoji">
+          <div className="emoji-mart-preview-emoji" aria-hidden="true">
             {idleEmoji &&
               idleEmoji.length &&
               NimbleEmoji({ emoji: idleEmoji, data: this.data, ...emojiProps })}
           </div>
 
-          <div className="emoji-mart-preview-data">
+          <div className="emoji-mart-preview-data" aria-hidden="true">
             <span className="emoji-mart-title-label">{title}</span>
           </div>
 
diff --git a/src/components/search.js b/src/components/search.js
index 7d48514..bf7773a 100644
--- a/src/components/search.js
+++ b/src/components/search.js
@@ -83,7 +83,7 @@ export default class Search extends React.PureComponent {
     const inputId = `emoji-mart-search-${id}`
 
     return (
-      <div className="emoji-mart-search">
+      <section className="emoji-mart-search" aria-label={i18n.search}>
         <input
           id={inputId}
           ref={this.setRef}
@@ -108,7 +108,7 @@ export default class Search extends React.PureComponent {
         >
           {icon()}
         </button>
-      </div>
+      </section>
     )
   }
 }