Merge pull request wix#1597 from wix/fix/marking_bug

Fix bug in marking + update weekCalendar screen name
WemasteLLC · Aug 9, 2021 · 87b0b9c · 87b0b9c
2 parents 41ae79f + 9f31a53
commit 87b0b9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/example/src/screens/menu.js b/example/src/screens/menu.js
@@ -65,7 +65,7 @@ export default class MenuScreen extends Component {
         options: {
           topBar: {
             title: {
-              text: screen
+              text: props?.weekView ? 'WeekCalendar' : screen
             },
             backButton: {
               accessibilityLabel: 'back',

diff --git a/src/calendar/day/marking/index.tsx b/src/calendar/day/marking/index.tsx
@@ -91,7 +91,7 @@ export default class Marking extends Component<MarkingProps> {
 
     if (items && Array.isArray(items) && items.length > 0) {
       // Filter out items so that we process only those which have color property
-      const validItems = _.filter(items, function(o: DOT | PERIOD) { return !o.color; });
+      const validItems = _.filter(items, function(o: DOT | PERIOD) { return o.color; });
 
       return validItems.map((item, index) => {
         return type === MarkingTypes.MULTI_DOT ? this.renderDot(index, item) : this.renderPeriod(index, item);