Merge pull request #9 from SeanMcP/v1.1

V1.1
SeanMcP · Sep 5, 2019 · bef75c9 · bef75c9
2 parents 8e336bb + a5cdafc
commit bef75c9
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -1,39 +1,40 @@
 {
-  "name": "a11y-react-emoji",
-  "version": "1.0.2",
-  "description": "An accessible Emoji component for React applications",
-  "main": "lib/index.js",
-  "repository": "https://github.com/seanmcp/a11y-react-emoji",
-  "homepage": "https://github.com/seanmcp/a11y-react-emoji#readme",
-  "bugs": "https://github.com/seanmcp/a11y-react-emoji/issues",
-  "author": "Sean McPherson <[email protected]> (https://github.com/seanmcp)",
-  "license": "MIT",
-  "devDependencies": {
-    "@types/jest": "^23.3.11",
-    "@types/react": "^16.7.18",
-    "@types/react-dom": "^16.0.11",
-    "jest": "^23.6.0",
-    "react": "^16.7.0",
-    "react-dom": "^16.7.0",
-    "ts-jest": "^23.10.5",
-    "typescript": "^3.2.2"
-  },
-  "peerDependencies": {
-    "react": "^16.7.0",
-    "react-dom": "^16.7.0"
-  },
-  "scripts": {
-    "build": "rm -rf \"./lib\" && mkdir \"./lib\" && tsc",
-    "test": "jest"
-  },
-  "files": [
-    "lib"
-  ],
-  "keywords": [
-    "react",
-    "emoji",
-    "a11y",
-    "accessibility",
-    "accessible"
-  ]
+    "name": "a11y-react-emoji",
+    "version": "1.1.1",
+    "description": "An accessible Emoji component for React applications",
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
+    "repository": "https://github.com/seanmcp/a11y-react-emoji",
+    "homepage": "https://github.com/seanmcp/a11y-react-emoji#readme",
+    "bugs": "https://github.com/seanmcp/a11y-react-emoji/issues",
+    "author": "Sean McPherson <[email protected]> (https://github.com/seanmcp)",
+    "license": "MIT",
+    "devDependencies": {
+        "@types/jest": "^23.3.11",
+        "@types/react": "^16.7.18",
+        "@types/react-dom": "^16.0.11",
+        "jest": "^23.6.0",
+        "react": "^16.7.0",
+        "react-dom": "^16.7.0",
+        "ts-jest": "^23.10.5",
+        "typescript": "^3.2.2"
+    },
+    "peerDependencies": {
+        "react": "^16.7.0",
+        "react-dom": "^16.7.0"
+    },
+    "scripts": {
+        "build": "rm -rf \"./lib\" && mkdir \"./lib\" && tsc",
+        "test": "jest"
+    },
+    "files": [
+        "lib"
+    ],
+    "keywords": [
+        "react",
+        "emoji",
+        "a11y",
+        "accessibility",
+        "accessible"
+    ]
 }
diff --git a/src/Emoji.test.ts b/src/Emoji.test.ts
@@ -13,12 +13,12 @@ test('Is a defined function', () => {
 
 test('Sets aria-hidden, -label when label prop is NOT passed', () => {
     const output = Emoji({ symbol: props.symbol });
-    expect(output.props['aria-hidden']).toMatch('true');
-    expect(output.props['aria-label']).toBe(null);
+    expect(output.props['aria-hidden']).toBe(true);
+    expect(output.props['aria-label']).toBe(undefined);
 });
 
 test('Sets aria-hidden, -label when label prop IS passed', () => {
     const output = Emoji(props);
-    expect(output.props['aria-hidden']).toBe(null);
+    expect(output.props['aria-hidden']).toBe(undefined);
     expect(output.props['aria-label']).toMatch(props.label);
 });
diff --git a/src/Emoji.tsx b/src/Emoji.tsx
@@ -1,16 +1,16 @@
 import * as React from 'react';
 
-interface EmojiProps {
+interface Props extends React.HTMLAttributes<HTMLSpanElement> {
     label?: string;
     symbol: string;
 }
 
-function Emoji(props: EmojiProps) {
+function Emoji(props: Props) {
     const { label, symbol, ...rest } = props;
     return (
         <span
-            aria-hidden={label ? null : 'true'}
-            aria-label={label ? label : null}
+            aria-hidden={label ? undefined : true}
+            aria-label={label ? label : undefined}
             role="img"
             {...rest}
         >