diff --git a/example/App.tsx b/example/App.tsx index c32527f..f8d2c3a 100644 --- a/example/App.tsx +++ b/example/App.tsx @@ -18,6 +18,7 @@ const THEME: ThemeType = { startDateContainerStyle: {}, endDateContainerStyle: {}, dayContainerStyle: { + marginVertical: 0, backgroundColor: 'transparent', }, dayContentStyle: { @@ -37,6 +38,9 @@ const THEME: ThemeType = { }, dayOutOfRangeContainerStyle: {}, dayOutOfRangeTextStyle: {}, + weekendContainerStyle: { + backgroundColor: 'rgb(249,250,252)', + }, todayContainerStyle: {}, todayTextStyle: { color: BLUE, diff --git a/src/__tests__/Day.test.tsx b/src/__tests__/Day.test.tsx index 1623cd8..bde110c 100644 --- a/src/__tests__/Day.test.tsx +++ b/src/__tests__/Day.test.tsx @@ -13,6 +13,7 @@ const defaultDay = { isStartDate: false, isEndDate: false, isVisible: true, + isWeekend: false, isOutOfRange: false, isHidden: false, }; diff --git a/src/__tests__/__snapshots__/Month.test.tsx.snap b/src/__tests__/__snapshots__/Month.test.tsx.snap index bb1b88c..86bdc16 100644 --- a/src/__tests__/__snapshots__/Month.test.tsx.snap +++ b/src/__tests__/__snapshots__/Month.test.tsx.snap @@ -169,6 +169,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -180,6 +181,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -229,6 +231,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -241,6 +244,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -288,6 +292,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -300,6 +305,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -347,6 +353,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -359,6 +366,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -406,6 +414,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -418,6 +427,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -465,6 +475,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -477,6 +488,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -523,6 +535,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -534,6 +547,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -590,6 +604,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -601,6 +616,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -650,6 +666,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -662,6 +679,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -709,6 +727,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -721,6 +740,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -768,6 +788,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -780,6 +801,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -827,6 +849,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -839,6 +862,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -886,6 +910,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -898,6 +923,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -944,6 +970,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -955,6 +982,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -1011,6 +1039,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -1022,6 +1051,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -1071,6 +1101,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1083,6 +1114,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1130,6 +1162,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1142,6 +1175,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1189,6 +1223,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1201,6 +1236,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1248,6 +1284,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1260,6 +1297,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1307,6 +1345,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1319,6 +1358,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1365,6 +1405,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -1376,6 +1417,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -1432,6 +1474,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -1443,6 +1486,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -1492,6 +1536,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1504,6 +1549,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1551,6 +1597,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1563,6 +1610,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1610,6 +1658,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1622,6 +1671,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1669,6 +1719,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1681,6 +1732,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1728,6 +1780,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1740,6 +1793,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1786,6 +1840,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -1797,6 +1852,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -1853,6 +1909,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -1864,6 +1921,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -1913,6 +1971,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1925,6 +1984,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -1972,6 +2032,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -1984,6 +2045,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -2021,6 +2083,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2033,6 +2096,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2046,6 +2110,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2074,6 +2139,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2086,6 +2152,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2099,6 +2166,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2127,6 +2195,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2139,6 +2208,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2152,6 +2222,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2172,6 +2243,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -2191,6 +2263,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -2202,6 +2275,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -2376,6 +2450,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2388,6 +2463,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2401,6 +2477,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2429,6 +2506,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2441,6 +2519,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2454,6 +2533,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2482,6 +2562,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2494,6 +2575,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2507,6 +2589,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2535,6 +2618,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2547,6 +2631,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2560,6 +2645,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2588,6 +2674,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2600,6 +2687,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2613,6 +2701,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -2633,6 +2722,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -2652,6 +2742,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -2663,6 +2754,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -2703,6 +2795,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -2714,6 +2807,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -2771,6 +2865,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2783,6 +2878,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -2830,6 +2926,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2842,6 +2939,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -2889,6 +2987,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2901,6 +3000,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -2948,6 +3048,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -2960,6 +3061,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3007,6 +3109,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3019,6 +3122,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3065,6 +3169,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -3076,6 +3181,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -3124,6 +3230,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -3135,6 +3242,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -3192,6 +3300,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3204,6 +3313,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3251,6 +3361,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3263,6 +3374,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3310,6 +3422,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3322,6 +3435,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3369,6 +3483,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3381,6 +3496,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3428,6 +3544,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3440,6 +3557,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3486,6 +3604,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -3497,6 +3616,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -3545,6 +3665,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -3556,6 +3677,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -3613,6 +3735,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3625,6 +3748,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3672,6 +3796,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3684,6 +3809,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3731,6 +3857,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3743,6 +3870,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3790,6 +3918,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3802,6 +3931,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3849,6 +3979,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -3861,6 +3992,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -3907,6 +4039,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -3918,6 +4051,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -3966,6 +4100,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -3977,6 +4112,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -4034,6 +4170,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4046,6 +4183,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -4093,6 +4231,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4105,6 +4244,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -4152,6 +4292,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4164,6 +4305,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -4211,6 +4353,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4223,6 +4366,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -4270,6 +4414,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4282,6 +4427,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -4328,6 +4474,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -4339,6 +4486,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -4387,6 +4535,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -4398,6 +4547,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -4455,6 +4605,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4467,6 +4618,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -4514,6 +4666,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4526,6 +4679,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -4563,6 +4717,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -4575,6 +4730,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4588,6 +4744,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -4616,6 +4773,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -4628,6 +4786,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4641,6 +4800,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -4669,6 +4829,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -4681,6 +4842,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4694,6 +4856,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -4714,6 +4877,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -4733,6 +4897,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -4744,6 +4909,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -4767,6 +4933,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -4786,6 +4953,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -4797,6 +4965,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -4971,6 +5140,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -4983,6 +5153,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -4996,6 +5167,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -5024,6 +5196,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -5036,6 +5209,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5049,6 +5223,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -5077,6 +5252,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -5089,6 +5265,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5102,6 +5279,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -5130,6 +5308,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -5142,6 +5321,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5155,6 +5335,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -5183,6 +5364,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -5195,6 +5377,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5208,6 +5391,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -5228,6 +5412,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -5247,6 +5432,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -5258,6 +5444,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -5298,6 +5485,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -5309,6 +5497,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -5366,6 +5555,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5378,6 +5568,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -5425,6 +5616,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5437,6 +5629,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -5484,6 +5677,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5496,6 +5690,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -5543,6 +5738,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5555,6 +5751,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -5602,6 +5799,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5614,6 +5812,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -5660,6 +5859,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -5671,6 +5871,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -5719,6 +5920,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -5730,6 +5932,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -5787,6 +5990,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5799,6 +6003,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -5846,6 +6051,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5858,6 +6064,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -5905,6 +6112,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5917,6 +6125,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -5964,6 +6173,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -5976,6 +6186,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6023,6 +6234,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6035,6 +6247,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6081,6 +6294,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -6092,6 +6306,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -6140,6 +6355,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -6151,6 +6367,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -6208,6 +6425,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6220,6 +6438,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6267,6 +6486,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6279,6 +6499,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6326,6 +6547,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6338,6 +6560,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6385,6 +6608,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6397,6 +6621,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6444,6 +6669,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6456,6 +6682,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6502,6 +6729,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -6513,6 +6741,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -6561,6 +6790,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -6572,6 +6802,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -6629,6 +6860,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6641,6 +6873,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6688,6 +6921,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6700,6 +6934,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6747,6 +6982,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6759,6 +6995,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6806,6 +7043,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6818,6 +7056,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6865,6 +7104,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -6877,6 +7117,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -6923,6 +7164,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -6934,6 +7176,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -6982,6 +7225,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -6993,6 +7237,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -7050,6 +7295,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7062,6 +7308,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -7109,6 +7356,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7121,6 +7369,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -7158,6 +7407,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7170,6 +7420,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7183,6 +7434,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7211,6 +7463,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7223,6 +7476,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7236,6 +7490,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7264,6 +7519,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7276,6 +7532,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7289,6 +7546,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7309,6 +7567,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -7328,6 +7587,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -7339,6 +7599,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -7362,6 +7623,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -7381,6 +7643,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -7392,6 +7655,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -7436,6 +7700,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7448,6 +7713,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7461,6 +7727,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7489,6 +7756,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7501,6 +7769,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7514,6 +7783,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7542,6 +7812,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7554,6 +7825,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7567,6 +7839,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7595,6 +7868,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7607,6 +7881,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7620,6 +7895,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7648,6 +7924,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7660,6 +7937,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7673,6 +7951,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -7693,6 +7972,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -7712,6 +7992,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -7723,6 +8004,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -7763,6 +8045,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -7774,6 +8057,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -7831,6 +8115,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7843,6 +8128,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -7890,6 +8176,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7902,6 +8189,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -7949,6 +8237,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -7961,6 +8250,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8008,6 +8298,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8020,6 +8311,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8067,6 +8359,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8079,6 +8372,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8125,6 +8419,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -8136,6 +8431,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -8184,6 +8480,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -8195,6 +8492,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -8252,6 +8550,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8264,6 +8563,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8311,6 +8611,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8323,6 +8624,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8370,6 +8672,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8382,6 +8685,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8429,6 +8733,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8441,6 +8746,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8488,6 +8794,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8500,6 +8807,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8546,6 +8854,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -8557,6 +8866,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -8605,6 +8915,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -8616,6 +8927,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -8673,6 +8985,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8685,6 +8998,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8732,6 +9046,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8744,6 +9059,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8791,6 +9107,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8803,6 +9120,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8850,6 +9168,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8862,6 +9181,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8909,6 +9229,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -8921,6 +9242,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -8967,6 +9289,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -8978,6 +9301,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -9026,6 +9350,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -9037,6 +9362,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -9094,6 +9420,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9106,6 +9433,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -9153,6 +9481,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9165,6 +9494,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -9212,6 +9542,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9224,6 +9555,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -9271,6 +9603,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9283,6 +9616,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -9330,6 +9664,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9342,6 +9677,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -9388,6 +9724,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -9399,6 +9736,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -9447,6 +9785,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -9458,6 +9797,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -9515,6 +9855,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9527,6 +9868,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -9574,6 +9916,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9586,6 +9929,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -9623,6 +9967,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -9635,6 +9980,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9648,6 +9994,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -9676,6 +10023,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -9688,6 +10036,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9701,6 +10050,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -9729,6 +10079,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -9741,6 +10092,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9754,6 +10106,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -9774,6 +10127,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -9793,6 +10147,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -9804,6 +10159,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -9827,6 +10183,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -9846,6 +10203,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -9857,6 +10215,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -9901,6 +10260,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -9913,6 +10273,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9926,6 +10287,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -9954,6 +10316,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -9966,6 +10329,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -9979,6 +10343,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -10007,6 +10372,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -10019,6 +10385,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10032,6 +10399,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -10060,6 +10428,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -10072,6 +10441,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10085,6 +10455,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -10113,6 +10484,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -10125,6 +10497,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10138,6 +10511,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -10158,6 +10532,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -10177,6 +10552,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -10188,6 +10564,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -10228,6 +10605,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -10239,6 +10617,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -10296,6 +10675,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10308,6 +10688,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -10355,6 +10736,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10367,6 +10749,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -10414,6 +10797,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10426,6 +10810,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -10473,6 +10858,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10485,6 +10871,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -10532,6 +10919,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10544,6 +10932,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -10590,6 +10979,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -10601,6 +10991,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -10649,6 +11040,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -10660,6 +11052,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -10717,6 +11110,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10729,6 +11123,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -10776,6 +11171,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10788,6 +11184,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -10835,6 +11232,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10847,6 +11245,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -10894,6 +11293,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10906,6 +11306,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -10953,6 +11354,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -10965,6 +11367,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11011,6 +11414,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -11022,6 +11426,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -11070,6 +11475,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -11081,6 +11487,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -11138,6 +11545,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11150,6 +11558,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11197,6 +11606,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11209,6 +11619,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11256,6 +11667,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11268,6 +11680,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11315,6 +11728,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11327,6 +11741,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11374,6 +11789,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11386,6 +11802,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11432,6 +11849,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -11443,6 +11861,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -11491,6 +11910,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -11502,6 +11922,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -11559,6 +11980,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11571,6 +11993,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11618,6 +12041,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11630,6 +12054,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11677,6 +12102,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11689,6 +12115,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11736,6 +12163,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11748,6 +12176,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11795,6 +12224,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11807,6 +12237,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -11853,6 +12284,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -11864,6 +12296,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -11912,6 +12345,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -11923,6 +12357,7 @@ Array [ "color": "black", }, undefined, + undefined, Object {}, Object {}, ] @@ -11980,6 +12415,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -11992,6 +12428,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -12039,6 +12476,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -12051,6 +12489,7 @@ Array [ undefined, Object {}, Object {}, + Object {}, ] } > @@ -12088,6 +12527,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -12100,6 +12540,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -12113,6 +12554,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -12141,6 +12583,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -12153,6 +12596,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -12166,6 +12610,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -12194,6 +12639,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -12206,6 +12652,7 @@ Array [ }, undefined, Object {}, + Object {}, ] } > @@ -12219,6 +12666,7 @@ Array [ Object {}, Object {}, Object {}, + Object {}, ] } > @@ -12239,6 +12687,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -12258,6 +12707,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -12269,6 +12719,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, @@ -12292,6 +12743,7 @@ Array [ }, undefined, undefined, + undefined, Object {}, Object {}, Object {}, @@ -12311,6 +12763,7 @@ Array [ "justifyContent": "center", }, undefined, + undefined, Object {}, ] } @@ -12322,6 +12775,7 @@ Array [ "color": "#d3d3d3", }, undefined, + undefined, Object {}, Object {}, Object {}, diff --git a/src/components/Day/index.tsx b/src/components/Day/index.tsx index b1b6f29..8e27435 100644 --- a/src/components/Day/index.tsx +++ b/src/components/Day/index.tsx @@ -39,6 +39,7 @@ interface NonTouchableDayProps { isStartDate: boolean; isEndDate: boolean; isVisible: boolean; + isWeekend: boolean; isToday: boolean; theme: ThemeType; } @@ -53,6 +54,7 @@ const NonTouchableDay = React.memo( isEndDate, theme, date, + isWeekend, isToday, } = props; @@ -62,6 +64,7 @@ const NonTouchableDay = React.memo( styles.container, theme.dayContainerStyle, theme.nonTouchableDayContainerStyle, + isWeekend ? theme.weekendContainerStyle : {}, isToday && !isActive ? theme.todayContainerStyle : {}, isActive ? styles.activeDate : {}, isActive ? theme.activeDayContainerStyle : {}, @@ -76,6 +79,7 @@ const NonTouchableDay = React.memo( style={[ styles.content, theme.dayContentStyle, + isWeekend ? theme.weekendContentStyle : {}, isActive ? theme.activeDayContentStyle : {}, ]} > @@ -83,6 +87,7 @@ const NonTouchableDay = React.memo( style={[ styles.nonTouchableDayText, theme.nonTouchableDayTextStyle, + isWeekend ? theme.weekendTextStyle : {}, isMonthDate ? theme.nonTouchableLastMonthDayTextStyle : {}, isToday ? theme.todayTextStyle : {}, isOutOfRange ? theme.dayOutOfRangeTextStyle : {}, @@ -124,6 +129,7 @@ const Day = React.memo( isMonthDate, isOutOfRange, isToday, + isWeekend, isHidden, }, dots = [], @@ -167,6 +173,7 @@ const Day = React.memo( isStartDate={isStartDate} isEndDate={isEndDate} isVisible={isVisible} + isWeekend={isWeekend} isToday={isToday} /> ); @@ -180,6 +187,7 @@ const Day = React.memo( style={[ styles.container, theme.dayContainerStyle, + isWeekend ? theme.weekendContainerStyle : {}, isToday && !isActive ? theme.todayContainerStyle : {}, isActive ? styles.activeDate : {}, isActive ? theme.activeDayContainerStyle : {}, @@ -197,6 +205,7 @@ const Day = React.memo( style={[ styles.content, theme.dayContentStyle, + isWeekend ? theme.weekendContentStyle : {}, isActive ? theme.activeDayContentStyle : {}, ]} > @@ -204,6 +213,7 @@ const Day = React.memo( style={[ dayTextStyle, theme.dayTextStyle, + isWeekend ? theme.weekendTextStyle : {}, isToday ? theme.todayTextStyle : {}, isActive ? theme.activeDayTextStyle : {}, ]} diff --git a/src/components/utils.tsx b/src/components/utils.tsx index 73b3312..50f8eab 100644 --- a/src/components/utils.tsx +++ b/src/components/utils.tsx @@ -2,6 +2,8 @@ import { addDays, getNumberOfDaysInMonth } from '../utils/date'; import { changedDate, changeMarkedDays, sameDate } from '../utils/validations'; import { MonthProps, DayType } from '../types'; +const SATURDAY = 6; +const SUNDAY = 0; const MONDAY_FIRST = [6, 0, 1, 2, 3, 4, 5]; function dayShouldBeActive( @@ -100,6 +102,8 @@ export function getMonthDays( } const today = new Date(); + const dow = date.getDay(); + const isWeekend = dow === SATURDAY || dow === SUNDAY; const isToday = day === today.getDate() && localMonth === today.getMonth() && @@ -110,6 +114,7 @@ export function getMonthDays( id: id, date, isToday, + isWeekend, isMonthDate, isActive, isStartDate, diff --git a/src/types.ts b/src/types.ts index 03d5c76..3b0cbee 100644 --- a/src/types.ts +++ b/src/types.ts @@ -18,6 +18,9 @@ interface DayTheme { nonTouchableDayContainerStyle?: ViewStyle; nonTouchableDayTextStyle?: TextStyle; nonTouchableLastMonthDayTextStyle?: TextStyle; + weekendContainerStyle?: ViewStyle; + weekendContentStyle?: ViewStyle; + weekendTextStyle?: TextStyle; todayContainerStyle?: ViewStyle; todayTextStyle?: TextStyle; } @@ -59,6 +62,7 @@ export type DayType = { isOutOfRange: boolean; isStartDate: boolean; isToday: boolean; + isWeekend: boolean; isVisible: boolean; };