Merge pull request #995 from KhalisFoundation/dev

Release 1.7.2
KhalisFoundation · Mar 12, 2020 · c88da30 · c88da30
2 parents 10adb3a + 4bccaaf
commit c88da30
Show file tree

Hide file tree

Showing 20 changed files with 317 additions and 212 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sttm/web",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Sevadaars are currently working hard to build a newer version of SikhiToTheMax website using modern web technologies.",
   "main": "index.js",
   "scripts": {

diff --git a/public/assets/images/doodle_hola_mahalla.png b/public/assets/images/doodle_hola_mahalla.png
diff --git a/public/assets/images/doodle_hola_mahalla_sm.png b/public/assets/images/doodle_hola_mahalla_sm.png
diff --git a/src/js/components/Autocomplete.js b/src/js/components/Autocomplete.js
@@ -126,8 +126,7 @@ class Autocomplete extends Component {
                       larivaarAssist={false}
                       enable={false}
                       unicode={false}
-                      startIndex={suggestion.startIndex}
-                      endIndex={suggestion.endIndex}
+                      highlightIndex={suggestion.highlightIndex}
                       query={suggestion.query}
                       type={searchOptions.type}
                     >

diff --git a/src/js/components/Header.js b/src/js/components/Header.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { SOURCES, SEARCH_TYPES, TYPES, SOURCES_WITH_ANG } from '../constants';
+import { SOURCES, SEARCH_TYPES, TYPES, SOURCES_WITH_ANG, DOODLE } from '../constants';
 import { Link } from 'react-router-dom';
 import EnhancedGurmukhiKeyboard from './GurmukhiKeyboardv2';
 import SearchForm from './SearchForm';
-import { toSearchURL, getQueryParams, getShabadList } from '../util';
+import { toSearchURL, getQueryParams, getShabadList, dateMath } from '../util';
 import CrossIcon from './Icons/Times';
 import Menu from './HeaderMenu';
 import KeyboardIcon from './Icons/Keyboard';
@@ -69,12 +69,16 @@ export default class Header extends React.PureComponent {
         <div className="top-bar-wrapper row">
           {!isHome && (
             <div className="top-bar-title">
-              <Link to="/" />
+              {dateMath.isFuture(DOODLE['date']) ?
+                (<Link to="/" title={DOODLE['title']} className="doodle-link"
+                  style={{ backgroundImage: `url(${DOODLE['smallImage']}) ` }} />) :
+                (<Link to="/" />)
+              }
             </div>
           )}
           <SearchForm
             key={key}
-            defaultQuery={defaultQuery}
+            defaultQuery={defaultQuery && decodeURIComponent(defaultQuery)}
             defaultSource={defaultSource}
             defaultType={defaultType}
             submitOnChangeOf={['type', 'source']}

diff --git a/src/js/components/Icons/Logo.js b/src/js/components/Icons/Logo.js
diff --git a/src/js/components/Larivaar/ImprovedLarivaar.tsx b/src/js/components/Larivaar/ImprovedLarivaar.tsx
@@ -6,8 +6,7 @@ import { getVisraamClass } from '@/util/index';
 
 export interface ILarivaarProps {
   larivaarAssist?: boolean;
-  startIndex?: number;
-  endIndex?: number;
+  highlightIndex?: Array<number>;
   enable?: boolean;
   unicode: boolean;
   children: string;
@@ -17,8 +16,7 @@ export interface ILarivaarProps {
 
 function Larivaar(props: ILarivaarProps) {
   const {
-    startIndex,
-    endIndex,
+    highlightIndex,
     larivaarAssist = false,
     enable = true,
     children,
@@ -30,8 +28,7 @@ function Larivaar(props: ILarivaarProps) {
   if (!enable) {
     return (
       <HighlightedSearchResult
-        startIndex={startIndex}
-        endIndex={endIndex}
+        highlightIndex={highlightIndex}
         query={query}
         visraams={visraam}
       >
@@ -52,8 +49,7 @@ function Larivaar(props: ILarivaarProps) {
 
         return (
           <LarivaarWord
-            startIndex={startIndex}
-            endIndex={endIndex}
+            highlightIndex={highlightIndex}
             key={index}
             word={word}
             unicode={unicode}

diff --git a/src/js/components/Larivaar/Word.tsx b/src/js/components/Larivaar/Word.tsx
@@ -7,16 +7,14 @@ export interface ILarivaarWordProps {
   unicode: boolean;
   larivaarAssist?: boolean;
   index: number;
-  startIndex?: number;
-  endIndex?: number;
+  highlightIndex?: Array<number>;
   highlight?: boolean;
   visraamClass: string;
 }
 
 function LarivaarWord(props: ILarivaarWordProps) {
   const {
-    startIndex,
-    endIndex,
+    highlightIndex,
     word,
     unicode,
     larivaarAssist,
@@ -40,10 +38,10 @@ function LarivaarWord(props: ILarivaarWordProps) {
         }
 
         // If this isn't a search result
-        if (!(startIndex !== undefined && endIndex !== undefined)) {
+        if (!(highlightIndex !== undefined)) {
           assistLarivaar = larivaarAssist && index % 2 === 1;
         } else {
-          if (highlight || (index >= startIndex && index < endIndex)) {
+          if (highlight || (highlightIndex.includes(index))) {
             akharClass += ' search-highlight-word';
           }
           assistLarivaar = larivaarAssist && index % 2 === 1;

diff --git a/src/js/components/Larivaar/__tests__/__snapshots__/Larivaar.test.tsx.snap b/src/js/components/Larivaar/__tests__/__snapshots__/Larivaar.test.tsx.snap
@@ -20,41 +20,49 @@ exports[`<Larivaar /> renders concatenated children when enabled 1`] = `
   <span
     class=""
   >
-    <span>
-      V
-      <wbr />
+    <span
+      class=""
+    >
+      <span>
+        V
+        <wbr />
+      </span>
     </span>
-  </span>
-  <span
-    class=""
-  >
-    <span>
-      a
-      <wbr />
+    <span
+      class=""
+    >
+      <span>
+        a
+        <wbr />
+      </span>
     </span>
-  </span>
-  <span
-    class=""
-  >
-    <span>
-      h
-      <wbr />
+    <span
+      class=""
+    >
+      <span>
+        h
+        <wbr />
+      </span>
     </span>
   </span>
   <span
-    class="larivaar-word"
+    class=""
   >
-    <span>
-      Gu
-      <wbr />
+    <span
+      class="larivaar-word"
+    >
+      <span>
+        Gu
+        <wbr />
+      </span>
     </span>
-  </span>
-  <span
-    class="larivaar-word"
-  >
-    <span>
-      ru
-      <wbr />
+    <span
+      class="larivaar-word"
+    >
+      <span>
+        ru
+        <wbr />
+      </span>
     </span>
   </span>
 </div>
@@ -80,45 +88,107 @@ Object {
       <span
         class=""
       >
-        <span>
-          V
-          <wbr />
+        <span
+          class=""
+        >
+          <span>
+            V
+            <wbr />
+          </span>
+        </span>
+        <span
+          class=""
+        >
+          <span>
+            a
+            <wbr />
+          </span>
+        </span>
+        <span
+          class=""
+        >
+          <span>
+            h
+            <wbr />
+          </span>
         </span>
       </span>
       <span
         class=""
       >
-        <span>
-          a
-          <wbr />
+        <span
+          class="larivaar-word"
+        >
+          <span>
+            Gu
+            <wbr />
+          </span>
+        </span>
+        <span
+          class="larivaar-word"
+        >
+          <span>
+            ru
+            <wbr />
+          </span>
         </span>
       </span>
+    </div>
+    <div>
       <span
         class=""
       >
-        <span>
-          h
-          <wbr />
+        <span
+          class=""
+        >
+          <span>
+            V
+            <wbr />
+          </span>
         </span>
-      </span>
-      <span
-        class="larivaar-word"
-      >
-        <span>
-          Gu
-          <wbr />
+        <span
+          class=""
+        >
+          <span>
+            a
+            <wbr />
+          </span>
+        </span>
+        <span
+          class=""
+        >
+          <span>
+            h
+            <wbr />
+          </span>
         </span>
       </span>
       <span
-        class="larivaar-word"
+        class=""
       >
-        <span>
-          ru
-          <wbr />
+        <span
+          class="larivaar-word larivaar-assist-word"
+        >
+          <span>
+            Gu
+            <wbr />
+          </span>
+        </span>
+        <span
+          class="larivaar-word larivaar-assist-word"
+        >
+          <span>
+            ru
+            <wbr />
+          </span>
         </span>
       </span>
     </div>
-    <div>
+  </body>,
+  "container": <div>
+    <span
+      class=""
+    >
       <span
         class=""
       >
@@ -143,6 +213,10 @@ Object {
           <wbr />
         </span>
       </span>
+    </span>
+    <span
+      class=""
+    >
       <span
         class="larivaar-word larivaar-assist-word"
       >
@@ -159,48 +233,6 @@ Object {
           <wbr />
         </span>
       </span>
-    </div>
-  </body>,
-  "container": <div>
-    <span
-      class=""
-    >
-      <span>
-        V
-        <wbr />
-      </span>
-    </span>
-    <span
-      class=""
-    >
-      <span>
-        a
-        <wbr />
-      </span>
-    </span>
-    <span
-      class=""
-    >
-      <span>
-        h
-        <wbr />
-      </span>
-    </span>
-    <span
-      class="larivaar-word larivaar-assist-word"
-    >
-      <span>
-        Gu
-        <wbr />
-      </span>
-    </span>
-    <span
-      class="larivaar-word larivaar-assist-word"
-    >
-      <span>
-        ru
-        <wbr />
-      </span>
     </span>
   </div>,
   "debug": [Function],